Skip to content

F
ffmpeg-mt
Commit 24d53fee authored by iive's avatar iive
Browse files
Options

move MPV_common_init after parsing stream parameters, matrix rebuild 


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2894 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 3e9b2cde
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 70 deletions
libavcodec/mpeg12.c
View file @ 24d53fee
......@@ -358,8 +358,13 @@ static inline void encode_mb_skip_run(MpegEncContext *s, int run){
static void common_init(MpegEncContext *s)
{
int i;
s->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
for(i=0;i<64;i++)
s->dsp.idct_permutation[i]=i;
}
void ff_mpeg1_clean_buffers(MpegEncContext *s){
......@@ -1745,8 +1750,13 @@ typedef struct Mpeg1Context {
MpegEncContext mpeg_enc_ctx;
int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
int repeat_field; /* true if we must repeat the field */
int display_weight;
int display_height;
AVPanScan pan_scan; /** some temporary storage for the panscan */
int slice_count;
int swap_uv;//indicate VCR2
int save_aspect_info;
} Mpeg1Context;
static int mpeg_decode_init(AVCodecContext *avctx)
......@@ -1766,6 +1776,122 @@ static int mpeg_decode_init(AVCodecContext *avctx)
return 0;
}
static void quant_matrix_rebuild(uint16_t *matrix, const uint8_t *old_perm,
const uint8_t *new_perm){
uint16_t temp_matrix[64];
int i;
memcpy(temp_matrix,matrix,64*sizeof(uint16_t));
for(i=0;i<64;i++){
matrix[new_perm[i]] = temp_matrix[old_perm[i]];
}
}
//Call this function when we know all parameters
//it may be called in different places for mpeg1 and mpeg2
static int mpeg_decode_postinit(AVCodecContext *avctx){
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
uint8_t old_permutation[64];
if (
(s1->mpeg_enc_ctx_allocated == 0)||
avctx->width != s->width ||
avctx->height != s->height||
// s1->save_aspect_info != avctx->aspect_ratio_info||
0)
{
if (s1->mpeg_enc_ctx_allocated) {
MPV_common_end(s);
}
if( (s->width == 0 )||(s->height == 0))
return -2;
avctx->width = s->width;
avctx->height = s->height;
avctx->bit_rate = s->bit_rate;
s1->save_aspect_info = s->aspect_ratio_info;
//low_delay may be forced, in this case we will have B frames
//that behave like P frames
avctx->has_b_frames = !(s->low_delay);
if(avctx->sub_id==1){//s->codec_id==avctx->codec_id==CODEC_ID
//mpeg1 fps
avctx->frame_rate = frame_rate_tab[s->frame_rate_index].num;
avctx->frame_rate_base= frame_rate_tab[s->frame_rate_index].den;
//mpeg1 aspect
avctx->sample_aspect_ratio= av_d2q(
1.0/mpeg1_aspect[s->aspect_ratio_info], 255);
}else{//mpeg2
//mpeg2 fps
av_reduce(
&s->avctx->frame_rate,
&s->avctx->frame_rate_base,
frame_rate_tab[s->frame_rate_index].num * (s->frame_rate_ext_n+1),
frame_rate_tab[s->frame_rate_index].den * (s->frame_rate_ext_d+1),
1<<30);
//mpeg2 aspect
if(s->aspect_ratio_info > 1){
if( (s1->display_weight == 0 )||(s1->display_height == 0) ){
s->avctx->sample_aspect_ratio=
mpeg2_aspect[s->aspect_ratio_info];
}else{
s->avctx->sample_aspect_ratio=
av_div_q(
mpeg2_aspect[s->aspect_ratio_info],
(AVRational){s1->display_weight, s1->display_height}
);
}
}else{
s->avctx->sample_aspect_ratio=
av_div_q(
mpeg2_aspect[s->aspect_ratio_info],
(AVRational){s->width, s->height}
);
}
}//mpeg2
if(avctx->xvmc_acceleration){
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
}else{
if(s->chroma_format < 2){
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420);
}else
if(s->chroma_format == 2){
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_422);
}else
if(s->chroma_format > 2){
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_444);
}
}
//until then pix_fmt may be changed right after codec init
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
if( avctx->idct_algo == FF_IDCT_AUTO )
avctx->idct_algo = FF_IDCT_SIMPLE;
//quantization matrixes may need reordering
//if dct permutation is changed
memcpy(old_permutation,s->dsp.idct_permutation,64*sizeof(uint8_t));
if (MPV_common_init(s) < 0)
return -2;
quant_matrix_rebuild(s->intra_matrix, old_permutation,s->dsp.idct_permutation);
quant_matrix_rebuild(s->inter_matrix, old_permutation,s->dsp.idct_permutation);
quant_matrix_rebuild(s->chroma_intra_matrix,old_permutation,s->dsp.idct_permutation);
quant_matrix_rebuild(s->chroma_inter_matrix,old_permutation,s->dsp.idct_permutation);
s1->mpeg_enc_ctx_allocated = 1;
}
return 0;
}
/* return the 8 bit start code value and update the search
state. Return -1 if no start code found */
static int find_start_code(const uint8_t **pbuf_ptr, const uint8_t *buf_end)
......@@ -1800,6 +1926,9 @@ static int mpeg1_decode_picture(AVCodecContext *avctx,
MpegEncContext *s = &s1->mpeg_enc_ctx;
int ref, f_code, vbv_delay;
if(mpeg_decode_postinit(s->avctx) < 0)
return -2;
init_get_bits(&s->gb, buf, buf_size*8);
ref = get_bits(&s->gb, 10); /* temporal ref */
......@@ -1838,7 +1967,6 @@ static void mpeg_decode_sequence_extension(MpegEncContext *s)
{
int horiz_size_ext, vert_size_ext;
int bit_rate_ext;
int frame_rate_ext_n, frame_rate_ext_d;
int level, profile;
skip_bits(&s->gb, 1); /* profil and level esc*/
......@@ -1858,32 +1986,17 @@ static void mpeg_decode_sequence_extension(MpegEncContext *s)
s->low_delay = get_bits1(&s->gb);
if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1;
frame_rate_ext_n = get_bits(&s->gb, 2);
frame_rate_ext_d = get_bits(&s->gb, 5);
av_reduce(
&s->avctx->frame_rate,
&s->avctx->frame_rate_base,
frame_rate_tab[s->frame_rate_index].num * (frame_rate_ext_n+1),
frame_rate_tab[s->frame_rate_index].den * (frame_rate_ext_d+1),
1<<30);
s->frame_rate_ext_n = get_bits(&s->gb, 2);
s->frame_rate_ext_d = get_bits(&s->gb, 5);
dprintf("sequence extension\n");
s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
s->avctx->sub_id = 2; /* indicates mpeg2 found */
if(s->aspect_ratio_info <= 1)
s->avctx->sample_aspect_ratio= mpeg2_aspect[s->aspect_ratio_info];
else{
s->avctx->sample_aspect_ratio=
av_div_q(
mpeg2_aspect[s->aspect_ratio_info],
(AVRational){s->width, s->height}
);
}
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d vbv buffer: %d, bitrate:%d\n",
profile, level, s->avctx->rc_buffer_size, s->bit_rate);
}
static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
......@@ -1906,12 +2019,9 @@ static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
s1->pan_scan.width= 16*w;
s1->pan_scan.height=16*h;
if(s->aspect_ratio_info > 1)
s->avctx->sample_aspect_ratio=
av_div_q(
mpeg2_aspect[s->aspect_ratio_info],
(AVRational){w, h}
);
s1->display_weight = w;
s1->display_height = h;
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
av_log(s->avctx, AV_LOG_DEBUG, "sde w:%d, h:%d\n", w, h);
......@@ -2372,59 +2482,23 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
{
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
int width, height, i, v, j;
float aspect;
int i, v, j;
init_get_bits(&s->gb, buf, buf_size*8);
width = get_bits(&s->gb, 12);
height = get_bits(&s->gb, 12);
s->width = get_bits(&s->gb, 12);
s->height = get_bits(&s->gb, 12);
s->aspect_ratio_info= get_bits(&s->gb, 4);
if (s->aspect_ratio_info == 0)
return -1;
aspect= 1.0/mpeg1_aspect[s->aspect_ratio_info];
avctx->sample_aspect_ratio= av_d2q(aspect, 255);
s->frame_rate_index = get_bits(&s->gb, 4);
if (s->frame_rate_index == 0 || s->frame_rate_index > 13)
return -1;
s->bit_rate = get_bits(&s->gb, 18) * 400;
if (get_bits1(&s->gb) == 0) /* marker */
return -1;
if (width <= 0 || height <= 0 ||
(width % 2) != 0 || (height % 2) != 0)
return -1;
if (width != s->width ||
height != s->height) {
/* start new mpeg1 context decoding */
s->out_format = FMT_MPEG1;
if (s1->mpeg_enc_ctx_allocated) {
MPV_common_end(s);
}
s->width = width;
s->height = height;
avctx->has_b_frames= 1;
avctx->width = width;
avctx->height = height;
avctx->frame_rate = frame_rate_tab[s->frame_rate_index].num;
avctx->frame_rate_base= frame_rate_tab[s->frame_rate_index].den;
avctx->bit_rate = s->bit_rate;
if(avctx->xvmc_acceleration){
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_xvmc_mpg2_420);
}else{
avctx->pix_fmt = avctx->get_format(avctx,pixfmt_yuv_420);
}
if( avctx->pix_fmt == PIX_FMT_XVMC_MPEG2_IDCT )
if( avctx->idct_algo == FF_IDCT_AUTO )
avctx->idct_algo = FF_IDCT_SIMPLE;
if (MPV_common_init(s) < 0)
if (s->width <= 0 || s->height <= 0)
return -1;
s1->mpeg_enc_ctx_allocated = 1;
s->swap_uv = 0;//just in case vcr2 and mpeg2 stream have been concatinated
}
s->avctx->rc_buffer_size= get_bits(&s->gb, 10) * 1024*16;
skip_bits(&s->gb, 1);
......@@ -2437,19 +2511,19 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
av_log(s->avctx, AV_LOG_ERROR, "intra matrix damaged\n");
return -1;
}
j = s->intra_scantable.permutated[i];
j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
s->intra_matrix[j] = v;
s->chroma_intra_matrix[j] = v;
}
#ifdef DEBUG
dprintf("intra matrix present\n");
for(i=0;i<64;i++)
dprintf(" %d", s->intra_matrix[s->intra_scantable.permutated[i]]);
dprintf(" %d", s->intra_matrix[s->dsp.idct_permutation[i]);
printf("\n");
#endif
} else {
for(i=0;i<64;i++) {
int j= s->dsp.idct_permutation[i];
j = s->dsp.idct_permutation[i];
v = ff_mpeg1_default_intra_matrix[i];
s->intra_matrix[j] = v;
s->chroma_intra_matrix[j] = v;
......@@ -2462,14 +2536,14 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
av_log(s->avctx, AV_LOG_ERROR, "inter matrix damaged\n");
return -1;
}
j = s->intra_scantable.permutated[i];
j = s->dsp.idct_permutation[ ff_zigzag_direct[i] ];
s->inter_matrix[j] = v;
s->chroma_inter_matrix[j] = v;
}
#ifdef DEBUG
dprintf("non intra matrix present\n");
for(i=0;i<64;i++)
dprintf(" %d", s->inter_matrix[s->intra_scantable.permutated[i]]);
dprintf(" %d", s->inter_matrix[s->dsp.idct_permutation[i]);
printf("\n");
#endif
} else {
......@@ -2494,6 +2568,8 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->chroma_format = 1;
s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO;
avctx->sub_id = 1; /* indicates mpeg1 */
s->out_format = FMT_MPEG1;
s->swap_uv = 0;//AFAIK VCR2 don't have SEQ_HEADER
if(s->flags & CODEC_FLAG_LOW_DELAY) s->low_delay=1;
if(s->avctx->debug & FF_DEBUG_PICT_INFO)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment