Remove or rename typedefs with _t prefixes.
_t prefixes are reserved for additional typenames in POSIX. R=henrik.lundin@webrtc.org, hta@webrtc.org, stefan@webrtc.org BUG=162 Review URL: https://webrtc-codereview.appspot.com/36559004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7931 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -11,13 +11,12 @@
|
||||
|
||||
#include <list>
|
||||
|
||||
#include "vpx/vpx_encoder.h"
|
||||
|
||||
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
|
||||
#include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
// libvpx forward declaration.
|
||||
typedef struct vpx_codec_enc_cfg vpx_codec_enc_cfg_t;
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
struct CodecSpecificInfoVP8;
|
||||
|
||||
@ -12,12 +12,11 @@
|
||||
#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_
|
||||
#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_TEMPORAL_LAYERS_H_
|
||||
|
||||
#include "vpx/vpx_encoder.h"
|
||||
|
||||
#include "webrtc/common_video/interface/video_image.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
// libvpx forward declaration.
|
||||
typedef struct vpx_codec_enc_cfg vpx_codec_enc_cfg_t;
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
struct CodecSpecificInfoVP8;
|
||||
|
||||
@ -378,7 +378,7 @@ int VP9DecoderImpl::InitDecode(const VideoCodec* inst, int number_of_cores) {
|
||||
return ret_val;
|
||||
}
|
||||
if (decoder_ == NULL) {
|
||||
decoder_ = new vpx_dec_ctx_t;
|
||||
decoder_ = new vpx_codec_ctx_t;
|
||||
}
|
||||
vpx_codec_dec_cfg_t cfg;
|
||||
// Setting number of threads to a constant value (1)
|
||||
|
||||
@ -14,13 +14,8 @@
|
||||
|
||||
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
|
||||
|
||||
// VPX forward declaration
|
||||
typedef struct vpx_codec_ctx vpx_codec_ctx_t;
|
||||
typedef struct vpx_codec_ctx vpx_dec_ctx_t;
|
||||
typedef struct vpx_codec_enc_cfg vpx_codec_enc_cfg_t;
|
||||
typedef struct vpx_image vpx_image_t;
|
||||
typedef struct vpx_ref_frame vpx_ref_frame_t;
|
||||
struct vpx_codec_cx_pkt;
|
||||
#include "vpx/vpx_decoder.h"
|
||||
#include "vpx/vpx_encoder.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
||||
@ -106,7 +101,7 @@ class VP9DecoderImpl : public VP9Decoder {
|
||||
I420VideoFrame decoded_image_;
|
||||
DecodedImageCallback* decode_complete_callback_;
|
||||
bool inited_;
|
||||
vpx_dec_ctx_t* decoder_;
|
||||
vpx_codec_ctx_t* decoder_;
|
||||
VideoCodec codec_;
|
||||
bool key_frame_required_;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user