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

Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'

Browse Source 
* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
  mpeg4videodec: add a mpeg4-specific private context.

Conflicts:
	libavcodec/mpeg4video_parser.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-29 22:27:28 +01:00
commit be0b869b04
3 changed files with 28 additions and 8 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 VOP_STARTCODE 0x1B6
typedef struct Mpeg4DecContext {
MpegEncContext m;
} Mpeg4DecContext;
/* dc encoding for mpeg4 */
extern const uint8_t ff_mpeg4_DCtab_lum[13][2];
extern const uint8_t ff_mpeg4_DCtab_chrom[13][2];

11
libavcodec/mpeg4video_parser.c
View File

@ -30,7 +30,7 @@
struct Mp4vParseContext {
ParseContext pc;
struct MpegEncContext enc;
Mpeg4DecContext dec_ctx;
int first_picture;
};
@ -78,7 +78,8 @@ static int av_mpeg4_decode_header(AVCodecParserContext *s1,
const uint8_t *buf, int buf_size)
{
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;
int ret;
@ -117,9 +118,9 @@ static av_cold int mpeg4video_parse_init(AVCodecParserContext *s)
ff_mpeg4videodec_static_init();
pc->first_picture = 1;
pc->enc.quant_precision = 5;
pc->enc.slice_context_count = 1;
pc->enc.showed_packed_warning = 1;
pc->dec_ctx.m.quant_precision = 5;
pc->dec_ctx.m.slice_context_count = 1;
pc->dec_ctx.m.showed_packed_warning = 1;
return 0;
}

21
libavcodec/mpeg4videodec.c
View File

@ -2501,9 +2501,24 @@ av_cold void ff_mpeg4videodec_static_init(void) {
}
}
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)
{
MpegEncContext *s = avctx->priv_data;
Mpeg4DecContext *ctx = avctx->priv_data;
MpegEncContext *s = &ctx->m;
int ret;
s->divx_version =
@ -2572,7 +2587,7 @@ AVCodec ff_mpeg4_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG4,
.priv_data_size = sizeof(MpegEncContext),
.priv_data_size = sizeof(Mpeg4DecContext),
.init = decode_init,
.close = ff_h263_decode_end,
.decode = ff_h263_decode_frame,
@ -2583,7 +2598,7 @@ AVCodec ff_mpeg4_decoder = {
.max_lowres = 3,
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
.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),
.priv_class = &mpeg4_class,
};