Skip to content

Commit

Permalink
MPEG-2 4:2:2 encoding support
Browse files Browse the repository at this point in the history 
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5387 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
  • Loading branch information
bcoudurier committed May 16, 2006
1 parent 7a81d02 commit 53e2f13
Show file tree
Hide file tree
Showing 4 changed files with 136 additions and 62 deletions.
2 changes: 2 additions & 0 deletions Changelog
View file
Expand Up @@ -45,6 +45,8 @@ version <next>
- Smacker demuxer and decoder
- NuppelVideo/MythTV demuxer and RTjpeg decoder
- KMVC decoder
- MPEG-2 intra vlc support
- MPEG-2 4:2:2 encoder

version 0.4.9-pre1:

Expand Down
69 changes: 43 additions & 26 deletions libavcodec/mpeg12.c
View file
Expand Up @@ -232,6 +232,12 @@ static int encode_init(AVCodecContext *avctx)
}
}

if(avctx->profile == FF_PROFILE_UNKNOWN)
avctx->profile = s->chroma_format == CHROMA_420 ? 4 : 0;

if(avctx->level == FF_LEVEL_UNKNOWN)
avctx->level = s->chroma_format == CHROMA_420 ? 8 : 5;

return 0;
}

Expand Down Expand Up @@ -319,22 +325,14 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
if(s->codec_id == CODEC_ID_MPEG2VIDEO){
put_header(s, EXT_START_CODE);
put_bits(&s->pb, 4, 1); //seq ext
put_bits(&s->pb, 1, 0); //esc

if(s->avctx->profile == FF_PROFILE_UNKNOWN){
put_bits(&s->pb, 3, 4); //profile
}else{
put_bits(&s->pb, 3, s->avctx->profile); //profile
}
put_bits(&s->pb, 1, s->chroma_format == CHROMA_422); //escx

if(s->avctx->level == FF_LEVEL_UNKNOWN){
put_bits(&s->pb, 4, 8); //level
}else{
put_bits(&s->pb, 4, s->avctx->level); //level
}
put_bits(&s->pb, 3, s->avctx->profile); //profile
put_bits(&s->pb, 4, s->avctx->level); //level

put_bits(&s->pb, 1, s->progressive_sequence);
put_bits(&s->pb, 2, 1); //chroma format 4:2:0
put_bits(&s->pb, 2, s->chroma_format);
put_bits(&s->pb, 2, 0); //horizontal size ext
put_bits(&s->pb, 2, 0); //vertical size ext
put_bits(&s->pb, 12, v>>18); //bitrate ext
Expand Down Expand Up @@ -468,7 +466,7 @@ void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
put_bits(&s->pb, 1, s->alternate_scan);
put_bits(&s->pb, 1, s->repeat_first_field);
s->progressive_frame = s->progressive_sequence;
put_bits(&s->pb, 1, s->chroma_420_type=s->progressive_frame);
put_bits(&s->pb, 1, s->chroma_format == CHROMA_420 ? s->progressive_frame : 0); /* chroma_420_type */
put_bits(&s->pb, 1, s->progressive_frame);
put_bits(&s->pb, 1, 0); //composite_display_flag
}
Expand Down Expand Up @@ -496,9 +494,10 @@ static inline void put_mb_modes(MpegEncContext *s, int n, int bits,
}
}

void mpeg1_encode_mb(MpegEncContext *s,
DCTELEM block[6][64],
int motion_x, int motion_y)
static always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
DCTELEM block[6][64],
int motion_x, int motion_y,
int mb_block_count)
{
int i, cbp;
const int mb_x = s->mb_x;
Expand All @@ -507,9 +506,9 @@ void mpeg1_encode_mb(MpegEncContext *s,

/* compute cbp */
cbp = 0;
for(i=0;i<6;i++) {
for(i=0;i<mb_block_count;i++) {
if (s->block_last_index[i] >= 0)
cbp |= 1 << (5 - i);
cbp |= 1 << (mb_block_count - 1 - i);
}

if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 &&
Expand Down Expand Up @@ -615,8 +614,14 @@ void mpeg1_encode_mb(MpegEncContext *s,
}
s->mv_bits+= get_bits_diff(s);
}
if(cbp)
put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]);
if(cbp) {
if (s->chroma_y_shift) {
put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]);
} else {
put_bits(&s->pb, mbPatTable[cbp>>2][1], mbPatTable[cbp>>2][0]);
put_bits(&s->pb, 2, cbp & 3);
}
}
s->f_count++;
} else{
static const int mb_type_len[4]={0,3,4,2}; //bak,for,bi
Expand Down Expand Up @@ -694,11 +699,17 @@ void mpeg1_encode_mb(MpegEncContext *s,
}
}
s->mv_bits += get_bits_diff(s);
if(cbp)
put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]);
if(cbp) {
if (s->chroma_y_shift) {
put_bits(&s->pb, mbPatTable[cbp][1], mbPatTable[cbp][0]);
} else {
put_bits(&s->pb, mbPatTable[cbp>>2][1], mbPatTable[cbp>>2][0]);
put_bits(&s->pb, 2, cbp & 3);
}
}
}
for(i=0;i<6;i++) {
if (cbp & (1 << (5 - i))) {
for(i=0;i<mb_block_count;i++) {
if (cbp & (1 << (mb_block_count - 1 - i))) {
mpeg1_encode_block(s, block[i], i);
}
}
Expand All @@ -710,6 +721,12 @@ void mpeg1_encode_mb(MpegEncContext *s,
}
}

void mpeg1_encode_mb(MpegEncContext *s, DCTELEM block[6][64], int motion_x, int motion_y)
{
if (s->chroma_format == CHROMA_420) mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6);
else mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8);
}

// RAL: Parameter added: f_or_b_code
static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
{
Expand Down Expand Up @@ -905,7 +922,7 @@ static void mpeg1_encode_block(MpegEncContext *s,

/* DC coef */
if (s->mb_intra) {
component = (n <= 3 ? 0 : n - 4 + 1);
component = (n <= 3 ? 0 : (n&1) + 1);
dc = block[0]; /* overflow is impossible */
diff = dc - s->last_dc[component];
encode_dc(s, diff, component);
Expand Down Expand Up @@ -3249,7 +3266,7 @@ AVCodec mpeg2video_encoder = {
MPV_encode_picture,
MPV_encode_end,
.supported_framerates= frame_rate_tab+1,
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, -1},
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_YUV422P, -1},
.capabilities= CODEC_CAP_DELAY,
};
#endif
Expand Down

0 comments on commit 53e2f13

Please sign in to comment.