virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mpeg4videodec: add a mpeg4-specific private context.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-26 10:41:57 +01:00
parent 95fd52c11b
commit 35e0833d41
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4video.h
View File

@ -59,6 +59,10 @@
#define VISUAL_OBJ_STARTCODE 0x1B5 #define VISUAL_OBJ_STARTCODE 0x1B5
#define VOP_STARTCODE 0x1B6 #define VOP_STARTCODE 0x1B6
typedef struct Mpeg4DecContext {
MpegEncContext m;
} Mpeg4DecContext;
/* dc encoding for mpeg4 */ /* dc encoding for mpeg4 */
extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; extern const uint8_t ff_mpeg4_DCtab_lum[13][2];
extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; extern const uint8_t ff_mpeg4_DCtab_chrom[13][2];

7
libavcodec/mpeg4video_parser.c
View File

@ -28,7 +28,7 @@
struct Mp4vParseContext { struct Mp4vParseContext {
ParseContext pc; ParseContext pc;
struct MpegEncContext enc; Mpeg4DecContext dec_ctx;
int first_picture; int first_picture;
}; };
@ -76,7 +76,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
struct Mp4vParseContext *pc = s1->priv_data; struct Mp4vParseContext *pc = s1->priv_data;
MpegEncContext *s = &pc->enc; Mpeg4DecContext *dec_ctx = &pc->dec_ctx;
MpegEncContext *s = &dec_ctx->m;
GetBitContext gb1, *gb = &gb1; GetBitContext gb1, *gb = &gb1;
int ret; int ret;
@ -106,7 +107,7 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s)
struct Mp4vParseContext *pc = s->priv_data; struct Mp4vParseContext *pc = s->priv_data;
pc->first_picture = 1; pc->first_picture = 1;
pc->enc.slice_context_count = 1; pc->dec_ctx.m.slice_context_count = 1;
return 0; return 0;
} }

21
libavcodec/mpeg4videodec.c
View File

@ -2397,9 +2397,24 @@ end:
return decode_vop_header(s, gb); return decode_vop_header(s, gb);
} }
static int mpeg4_update_thread_context(AVCodecContext *dst,
const AVCodecContext *src)
{
Mpeg4DecContext *s = dst->priv_data;
const Mpeg4DecContext *s1 = src->priv_data;
int ret = ff_mpeg_update_thread_context(dst, src);
if (ret < 0)
return ret;
return 0;
}
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
MpegEncContext *s = avctx->priv_data; Mpeg4DecContext *ctx = avctx->priv_data;
MpegEncContext *s = &ctx->m;
int ret; int ret;
static int done = 0; static int done = 0;
@ -2469,7 +2484,7 @@ AVCodec ff_mpeg4_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4, .id = AV_CODEC_ID_MPEG4,
.priv_data_size = sizeof(MpegEncContext), .priv_data_size = sizeof(Mpeg4DecContext),
.init = decode_init, .init = decode_init,
.close = ff_h263_decode_end, .close = ff_h263_decode_end,
.decode = ff_h263_decode_frame, .decode = ff_h263_decode_frame,
@ -2479,5 +2494,5 @@ AVCodec ff_mpeg4_decoder = {
.flush = ff_mpeg_flush, .flush = ff_mpeg_flush,
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
.profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles), .profiles = NULL_IF_CONFIG_SMALL(mpeg4_video_profiles),
.update_thread_context = ONLY_IF_THREADS_ENABLED(ff_mpeg_update_thread_context), .update_thread_context = ONLY_IF_THREADS_ENABLED(mpeg4_update_thread_context),
}; };