virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

mpeg12enc: K&R formatting cosmetics

Browse Source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Vittorio Giovara
2013-09-04 17:17:30 +02:00
committed by Diego Biurrun
parent 66f091053f
commit 7f93a861aa
1 changed files with 531 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

416
libavcodec/mpeg12enc.c
View File

@@ -25,29 +25,24 @@
* MPEG1/2 encoder * MPEG1/2 encoder
*/ */
#include "avcodec.h"
#include "mathops.h"
#include "mpegvideo.h"
#include "mpeg12.h"
#include "mpeg12data.h"
#include "bytestream.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h"
#include "bytestream.h"
#include "mathops.h"
#include "mpeg12.h"
#include "mpeg12data.h"
#include "mpegvideo.h"
static const uint8_t inv_non_linear_qscale[13] = {
0, 2, 4, 6, 8, static const uint8_t inv_non_linear_qscale[] = {
9,10,11,12,13,14,15,16, 0, 2, 4, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16,
}; };
static const uint8_t svcd_scan_offset_placeholder[14] = { static const uint8_t svcd_scan_offset_placeholder[] = {
0x10, 0x0E, 0x10, 0x0E, 0x00, 0x80, 0x81, 0x00, 0x80,
0x00, 0x80, 0x81, 0x81, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0x00, 0x80, 0x81,
0xff, 0xff, 0xff,
0xff, 0xff, 0xff,
}; };
static uint8_t mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1]; static uint8_t mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1];
@@ -56,7 +51,8 @@ static uint8_t fcode_tab[MAX_MV*2+1];
static uint8_t uni_mpeg1_ac_vlc_len[64 * 64 * 2]; static uint8_t uni_mpeg1_ac_vlc_len[64 * 64 * 2];
static uint8_t uni_mpeg2_ac_vlc_len[64 * 64 * 2]; static uint8_t uni_mpeg2_ac_vlc_len[64 * 64 * 2];
/* simple include everything table for dc, first byte is bits number next 3 are code*/ /* simple include everything table for dc, first byte is bits
* number next 3 are code */
static uint32_t mpeg1_lum_dc_uni[512]; static uint32_t mpeg1_lum_dc_uni[512];
static uint32_t mpeg1_chr_dc_uni[512]; static uint32_t mpeg1_chr_dc_uni[512];
@@ -74,7 +70,6 @@ static av_cold void init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len)
continue; continue;
for (run = 0; run < 64; run++) { for (run = 0; run < 64; run++) {
int len, code; int len, code;
int alevel = FFABS(level); int alevel = FFABS(level);
if (alevel > rl->max_level[0][run]) if (alevel > rl->max_level[0][run])
@@ -82,34 +77,37 @@ static av_cold void init_uni_ac_vlc(RLTable *rl, uint8_t *uni_ac_vlc_len)
else else
code = rl->index_run[0][run] + alevel - 1; code = rl->index_run[0][run] + alevel - 1;
if (code < 111 /* rl->n */) { if (code < 111) { /* rl->n */
/* length of vlc and sign */ /* length of VLC and sign */
len = rl->table_vlc[code][1] + 1; len = rl->table_vlc[code][1] + 1;
} else { } else {
len= rl->table_vlc[111/*rl->n*/][1]+6; len = rl->table_vlc[111][1] + 6; /* rl->n */
if (alevel < 128) { if (alevel < 128)
len += 8; len += 8;
} else { else
len += 16; len += 16;
} }
}
uni_ac_vlc_len[UNI_AC_ENC_INDEX(run, i)] = len; uni_ac_vlc_len[UNI_AC_ENC_INDEX(run, i)] = len;
} }
} }
} }
static int find_frame_rate_index(MpegEncContext *s)
static int find_frame_rate_index(MpegEncContext *s){ {
int i; int i;
int64_t dmin = INT64_MAX; int64_t dmin = INT64_MAX;
int64_t d; int64_t d;
for (i = 1; i < 14; i++) { for (i = 1; i < 14; i++) {
int64_t n0 = 1001LL / ff_mpeg12_frame_rate_tab[i].den * ff_mpeg12_frame_rate_tab[i].num * s->avctx->time_base.num; int64_t n0 = 1001LL / ff_mpeg12_frame_rate_tab[i].den *
ff_mpeg12_frame_rate_tab[i].num * s->avctx->time_base.num;
int64_t n1 = 1001LL * s->avctx->time_base.den; int64_t n1 = 1001LL * s->avctx->time_base.den;
if(s->avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL && i>=9) break;
if (s->avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL &&
i >= 9)
break;
d = FFABS(n0 - n1); d = FFABS(n0 - n1);
if (d < dmin) { if (d < dmin) {
@@ -117,6 +115,7 @@ static int find_frame_rate_index(MpegEncContext *s){
s->frame_rate_index = i; s->frame_rate_index = i;
} }
} }
if (dmin) if (dmin)
return -1; return -1;
else else
@@ -132,10 +131,13 @@ static av_cold int encode_init(AVCodecContext *avctx)
if (find_frame_rate_index(s) < 0) { if (find_frame_rate_index(s) < 0) {
if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { if (s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); av_log(avctx, AV_LOG_ERROR, "MPEG1/2 does not support %d/%d fps\n",
avctx->time_base.den, avctx->time_base.num);
return -1; return -1;
} else { } else {
av_log(avctx, AV_LOG_INFO, "MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n", avctx->time_base.den, avctx->time_base.num); av_log(avctx, AV_LOG_INFO,
"MPEG1/2 does not support %d/%d fps, there may be AV sync issues\n",
avctx->time_base.den, avctx->time_base.num);
} }
} }
@@ -144,26 +146,34 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Set profile and level\n"); av_log(avctx, AV_LOG_ERROR, "Set profile and level\n");
return -1; return -1;
} }
avctx->profile = s->chroma_format == CHROMA_420 ? 4 : 0; /* Main or 4:2:2 */ /* Main or 4:2:2 */
avctx->profile = s->chroma_format == CHROMA_420 ? 4 : 0;
} }
if (avctx->level == FF_LEVEL_UNKNOWN) { if (avctx->level == FF_LEVEL_UNKNOWN) {
if (avctx->profile == 0) { /* 4:2:2 */ if (avctx->profile == 0) { /* 4:2:2 */
if(avctx->width <= 720 && avctx->height <= 608) avctx->level = 5; /* Main */ if (avctx->width <= 720 && avctx->height <= 608)
else avctx->level = 2; /* High */ avctx->level = 5; /* Main */
else
avctx->level = 2; /* High */
} else { } else {
if (avctx->profile != 1 && s->chroma_format != CHROMA_420) { if (avctx->profile != 1 && s->chroma_format != CHROMA_420) {
av_log(avctx, AV_LOG_ERROR, "Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n"); av_log(avctx, AV_LOG_ERROR,
"Only High(1) and 4:2:2(0) profiles support 4:2:2 color sampling\n");
return -1; return -1;
} }
if(avctx->width <= 720 && avctx->height <= 576) avctx->level = 8; /* Main */ if (avctx->width <= 720 && avctx->height <= 576)
else if(avctx->width <= 1440) avctx->level = 6; /* High 1440 */ avctx->level = 8; /* Main */
else avctx->level = 4; /* High */ else if (avctx->width <= 1440)
avctx->level = 6; /* High 1440 */
else
avctx->level = 4; /* High */
} }
} }
if (s->drop_frame_timecode && s->frame_rate_index != 4) { if (s->drop_frame_timecode && s->frame_rate_index != 4) {
av_log(avctx, AV_LOG_ERROR, "Drop frame time code only allowed with 1001/30000 fps\n"); av_log(avctx, AV_LOG_ERROR,
"Drop frame time code only allowed with 1001/30000 fps\n");
return -1; return -1;
} }
@@ -180,15 +190,14 @@ static void put_header(MpegEncContext *s, int header)
/* put sequence header if needed */ /* put sequence header if needed */
static void mpeg1_encode_sequence_header(MpegEncContext *s) static void mpeg1_encode_sequence_header(MpegEncContext *s)
{ {
unsigned int vbv_buffer_size; unsigned int vbv_buffer_size, fps, v;
unsigned int fps, v; int i, constraint_parameter_flag;
int i;
uint64_t time_code; uint64_t time_code;
float best_aspect_error = 1E10; float best_aspect_error = 1E10;
float aspect_ratio = av_q2d(s->avctx->sample_aspect_ratio); float aspect_ratio = av_q2d(s->avctx->sample_aspect_ratio);
int constraint_parameter_flag;
if(aspect_ratio==0.0) aspect_ratio= 1.0; //pixel aspect 1:1 (VGA) if (aspect_ratio == 0.0)
aspect_ratio = 1.0; // pixel aspect 1.1 (VGA)
if (s->current_picture.f.key_frame) { if (s->current_picture.f.key_frame) {
AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index];
@@ -228,20 +237,23 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
if (s->avctx->rc_buffer_size) if (s->avctx->rc_buffer_size)
vbv_buffer_size = s->avctx->rc_buffer_size; vbv_buffer_size = s->avctx->rc_buffer_size;
else else
/* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */ /* VBV calculation: Scaled so that a VCD has the proper
* VBV size of 40 kilobytes */
vbv_buffer_size = ((20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024; vbv_buffer_size = ((20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
vbv_buffer_size = (vbv_buffer_size + 16383) / 16384; vbv_buffer_size = (vbv_buffer_size + 16383) / 16384;
put_sbits(&s->pb, 18, v); put_sbits(&s->pb, 18, v);
put_bits(&s->pb, 1, 1); /* marker */ put_bits(&s->pb, 1, 1); // marker
put_sbits(&s->pb, 10, vbv_buffer_size); put_sbits(&s->pb, 10, vbv_buffer_size);
constraint_parameter_flag = constraint_parameter_flag =
s->width <= 768 && s->height <= 576 && s->width <= 768 &&
s->height <= 576 &&
s->mb_width * s->mb_height <= 396 && s->mb_width * s->mb_height <= 396 &&
s->mb_width * s->mb_height * framerate.num <= framerate.den*396*25 && s->mb_width * s->mb_height * framerate.num <= 396 * 25 * framerate.den &&
framerate.num <= framerate.den * 30 && framerate.num <= framerate.den * 30 &&
s->avctx->me_range && s->avctx->me_range < 128 && s->avctx->me_range &&
s->avctx->me_range < 128 &&
vbv_buffer_size <= 20 && vbv_buffer_size <= 20 &&
v <= 1856000 / 400 && v <= 1856000 / 400 &&
s->codec_id == AV_CODEC_ID_MPEG1VIDEO; s->codec_id == AV_CODEC_ID_MPEG1VIDEO;
@@ -255,7 +267,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
put_header(s, EXT_START_CODE); put_header(s, EXT_START_CODE);
put_bits(&s->pb, 4, 1); // seq ext put_bits(&s->pb, 4, 1); // seq ext
put_bits(&s->pb, 1, s->avctx->profile == 0); //escx 1 for 4:2:2 profile */ put_bits(&s->pb, 1, s->avctx->profile == 0); // escx 1 for 4:2:2 profile
put_bits(&s->pb, 3, s->avctx->profile); // profile put_bits(&s->pb, 3, s->avctx->profile); // profile
put_bits(&s->pb, 4, s->avctx->level); // level put_bits(&s->pb, 4, s->avctx->level); // level
@@ -273,18 +285,21 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
} }
put_header(s, GOP_START_CODE); put_header(s, GOP_START_CODE);
put_bits(&s->pb, 1, s->drop_frame_timecode); /* drop frame flag */ put_bits(&s->pb, 1, s->drop_frame_timecode); // drop frame flag
/* time code: we must convert from the real frame rate to a /* time code: we must convert from the real frame rate to a
fake mpeg frame rate in case of low frame rate */ * fake MPEG frame rate in case of low frame rate */
fps = (framerate.num + framerate.den / 2) / framerate.den; fps = (framerate.num + framerate.den / 2) / framerate.den;
time_code = s->current_picture_ptr->f.coded_picture_number + s->avctx->timecode_frame_start; time_code = s->current_picture_ptr->f.coded_picture_number +
s->avctx->timecode_frame_start;
s->gop_picture_number = s->current_picture_ptr->f.coded_picture_number; s->gop_picture_number = s->current_picture_ptr->f.coded_picture_number;
if (s->drop_frame_timecode) { if (s->drop_frame_timecode) {
/* only works for NTSC 29.97 */ /* only works for NTSC 29.97 */
int d = time_code / 17982; int d = time_code / 17982;
int m = time_code % 17982; int m = time_code % 17982;
//if (m < 2) m += 2; /* not needed since -2,-1 / 1798 in C returns 0 */ /* not needed since -2,-1 / 1798 in C returns 0 */
// if (m < 2)
// m += 2;
time_code += 18 * d + 2 * ((m - 2) / 1798); time_code += 18 * d + 2 * ((m - 2) / 1798);
} }
put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24)); put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24));
@@ -293,11 +308,12 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60)); put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60));
put_bits(&s->pb, 6, (uint32_t)((time_code % fps))); put_bits(&s->pb, 6, (uint32_t)((time_code % fps)));
put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP)); put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
put_bits(&s->pb, 1, 0); /* broken link */ put_bits(&s->pb, 1, 0); // broken link
} }
} }
static inline void encode_mb_skip_run(MpegEncContext *s, int run){ static inline void encode_mb_skip_run(MpegEncContext *s, int run)
{
while (run >= 33) { while (run >= 33) {
put_bits(&s->pb, 11, 0x008); put_bits(&s->pb, 11, 0x008);
run -= 33; run -= 33;
@@ -316,15 +332,18 @@ static av_always_inline void put_qscale(MpegEncContext *s)
} }
} }
void ff_mpeg1_encode_slice_header(MpegEncContext *s){ void ff_mpeg1_encode_slice_header(MpegEncContext *s)
{
if (s->height > 2800) { if (s->height > 2800) {
put_header(s, SLICE_MIN_START_CODE + (s->mb_y & 127)); put_header(s, SLICE_MIN_START_CODE + (s->mb_y & 127));
put_bits(&s->pb, 3, s->mb_y >> 7); /* slice_vertical_position_extension */ /* slice_vertical_position_extension */
put_bits(&s->pb, 3, s->mb_y >> 7);
} else { } else {
put_header(s, SLICE_MIN_START_CODE + s->mb_y); put_header(s, SLICE_MIN_START_CODE + s->mb_y);
} }
put_qscale(s); put_qscale(s);
put_bits(&s->pb, 1, 0); /* slice extra information */ /* slice extra information */
put_bits(&s->pb, 1, 0);
} }
void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
@@ -336,15 +355,16 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
/* temporal reference */ /* temporal reference */
// RAL: s->picture_number instead of s->fake_picture_number // RAL: s->picture_number instead of s->fake_picture_number
put_bits(&s->pb, 10, (s->picture_number - put_bits(&s->pb, 10,
s->gop_picture_number) & 0x3ff); (s->picture_number - s->gop_picture_number) & 0x3ff);
put_bits(&s->pb, 3, s->pict_type); put_bits(&s->pb, 3, s->pict_type);
s->vbv_delay_ptr = s->pb.buf + put_bits_count(&s->pb) / 8; s->vbv_delay_ptr = s->pb.buf + put_bits_count(&s->pb) / 8;
put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */ put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */
// RAL: Forward f_code also needed for B frames // RAL: Forward f_code also needed for B-frames
if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_P ||
s->pict_type == AV_PICTURE_TYPE_B) {
put_bits(&s->pb, 1, 0); /* half pel coordinates */ put_bits(&s->pb, 1, 0); /* half pel coordinates */
if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
put_bits(&s->pb, 3, s->f_code); /* forward_f_code */ put_bits(&s->pb, 3, s->f_code); /* forward_f_code */
@@ -352,7 +372,7 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
put_bits(&s->pb, 3, 7); /* forward_f_code */ put_bits(&s->pb, 3, 7); /* forward_f_code */
} }
// RAL: Backward f_code necessary for B frames // RAL: Backward f_code necessary for B-frames
if (s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_B) {
put_bits(&s->pb, 1, 0); /* half pel coordinates */ put_bits(&s->pb, 1, 0); /* half pel coordinates */
if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO)
@@ -366,8 +386,9 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
s->frame_pred_frame_dct = 1; s->frame_pred_frame_dct = 1;
if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
put_header(s, EXT_START_CODE); put_header(s, EXT_START_CODE);
put_bits(&s->pb, 4, 8); //pic ext put_bits(&s->pb, 4, 8); /* pic ext */
if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) { if (s->pict_type == AV_PICTURE_TYPE_P ||
s->pict_type == AV_PICTURE_TYPE_B) {
put_bits(&s->pb, 4, s->f_code); put_bits(&s->pb, 4, s->f_code);
put_bits(&s->pb, 4, s->f_code); put_bits(&s->pb, 4, s->f_code);
} else { } else {
@@ -383,13 +404,11 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
assert(s->picture_structure == PICT_FRAME); assert(s->picture_structure == PICT_FRAME);
put_bits(&s->pb, 2, s->picture_structure); put_bits(&s->pb, 2, s->picture_structure);
if (s->progressive_sequence) { if (s->progressive_sequence)
put_bits(&s->pb, 1, 0); /* no repeat */ put_bits(&s->pb, 1, 0); /* no repeat */
} else { else
put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first); put_bits(&s->pb, 1, s->current_picture_ptr->f.top_field_first);
} /* XXX: optimize the generation of this flag with entropy measures */
/* XXX: optimize the generation of this flag with entropy
measures */
s->frame_pred_frame_dct = s->progressive_sequence; s->frame_pred_frame_dct = s->progressive_sequence;
put_bits(&s->pb, 1, s->frame_pred_frame_dct); put_bits(&s->pb, 1, s->frame_pred_frame_dct);
@@ -399,18 +418,19 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
put_bits(&s->pb, 1, s->alternate_scan); put_bits(&s->pb, 1, s->alternate_scan);
put_bits(&s->pb, 1, s->repeat_first_field); put_bits(&s->pb, 1, s->repeat_first_field);
s->progressive_frame = s->progressive_sequence; s->progressive_frame = s->progressive_sequence;
put_bits(&s->pb, 1, s->chroma_format == CHROMA_420 ? s->progressive_frame : 0); /* chroma_420_type */ /* chroma_420_type */
put_bits(&s->pb, 1, s->chroma_format ==
CHROMA_420 ? s->progressive_frame : 0);
put_bits(&s->pb, 1, s->progressive_frame); put_bits(&s->pb, 1, s->progressive_frame);
put_bits(&s->pb, 1, 0); //composite_display_flag put_bits(&s->pb, 1, 0); /* composite_display_flag */
} }
if (s->scan_offset) { if (s->scan_offset) {
int i; int i;
put_header(s, USER_START_CODE); put_header(s, USER_START_CODE);
for(i=0; i<sizeof(svcd_scan_offset_placeholder); i++){ for (i = 0; i < sizeof(svcd_scan_offset_placeholder); i++)
put_bits(&s->pb, 8, svcd_scan_offset_placeholder[i]); put_bits(&s->pb, 8, svcd_scan_offset_placeholder[i]);
} }
}
s->mb_y = 0; s->mb_y = 0;
ff_mpeg1_encode_slice_header(s); ff_mpeg1_encode_slice_header(s);
@@ -422,7 +442,8 @@ static inline void put_mb_modes(MpegEncContext *s, int n, int bits,
put_bits(&s->pb, n, bits); put_bits(&s->pb, n, bits);
if (!s->frame_pred_frame_dct) { if (!s->frame_pred_frame_dct) {
if (has_mv) if (has_mv)
put_bits(&s->pb, 2, 2 - field_motion); /* motion_type: frame/field */ /* motion_type: frame/field */
put_bits(&s->pb, 2, 2 - field_motion);
put_bits(&s->pb, 1, s->interlaced_dct); put_bits(&s->pb, 1, s->interlaced_dct);
} }
} }
@@ -462,11 +483,10 @@ static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code)
ff_mpeg12_mbMotionVectorTable[code][0]); ff_mpeg12_mbMotionVectorTable[code][0]);
put_bits(&s->pb, 1, sign); put_bits(&s->pb, 1, sign);
if (bit_size > 0) { if (bit_size > 0)
put_bits(&s->pb, bit_size, bits); put_bits(&s->pb, bit_size, bits);
} }
} }
}
static inline void encode_dc(MpegEncContext *s, int diff, int component) static inline void encode_dc(MpegEncContext *s, int diff, int component)
{ {
@@ -479,35 +499,29 @@ static inline void encode_dc(MpegEncContext *s, int diff, int component)
} else { } else {
index = av_log2_16bit(2 * diff); index = av_log2_16bit(2 * diff);
} }
if (component == 0) { if (component == 0)
put_bits( put_bits(&s->pb,
&s->pb,
ff_mpeg12_vlc_dc_lum_bits[index] + index, ff_mpeg12_vlc_dc_lum_bits[index] + index,
(ff_mpeg12_vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1))); (ff_mpeg12_vlc_dc_lum_code[index] << index) +
}else{ (diff & ((1 << index) - 1)));
put_bits( else
&s->pb, put_bits(&s->pb,
ff_mpeg12_vlc_dc_chroma_bits[index] + index, ff_mpeg12_vlc_dc_chroma_bits[index] + index,
(ff_mpeg12_vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1))); (ff_mpeg12_vlc_dc_chroma_code[index] << index) +
} (diff & ((1 << index) - 1)));
} else { } else {
if (component == 0) { if (component == 0)
put_bits( put_bits(&s->pb,
&s->pb,
mpeg1_lum_dc_uni[diff + 255] & 0xFF, mpeg1_lum_dc_uni[diff + 255] & 0xFF,
mpeg1_lum_dc_uni[diff + 255] >> 8); mpeg1_lum_dc_uni[diff + 255] >> 8);
} else { else
put_bits( put_bits(&s->pb,
&s->pb,
mpeg1_chr_dc_uni[diff + 255] & 0xFF, mpeg1_chr_dc_uni[diff + 255] & 0xFF,
mpeg1_chr_dc_uni[diff + 255] >> 8); mpeg1_chr_dc_uni[diff + 255] >> 8);
} }
} }
}
static void mpeg1_encode_block(MpegEncContext *s, static void mpeg1_encode_block(MpegEncContext *s, int16_t *block, int n)
int16_t *block,
int n)
{ {
int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign; int alevel, level, last_non_zero, dc, diff, i, j, run, last_index, sign;
int code, component; int code, component;
@@ -527,7 +541,7 @@ static void mpeg1_encode_block(MpegEncContext *s,
table_vlc = ff_rl_mpeg2.table_vlc; table_vlc = ff_rl_mpeg2.table_vlc;
} else { } else {
/* encode the first coefficient: needs to be done here because /* encode the first coefficient: needs to be done here because
it is handled slightly differently */ * it is handled slightly differently */
level = block[0]; level = block[0];
if (abs(level) == 1) { if (abs(level) == 1) {
code = ((uint32_t)level >> 31); /* the sign bit */ code = ((uint32_t)level >> 31); /* the sign bit */
@@ -546,6 +560,7 @@ static void mpeg1_encode_block(MpegEncContext *s,
for (; i <= last_index; i++) { for (; i <= last_index; i++) {
j = s->intra_scantable.permutated[i]; j = s->intra_scantable.permutated[i];
level = block[j]; level = block[j];
next_coef: next_coef:
/* encode using VLC */ /* encode using VLC */
if (level != 0) { if (level != 0) {
@@ -557,8 +572,9 @@ static void mpeg1_encode_block(MpegEncContext *s,
if (alevel <= mpeg1_max_level[0][run]) { if (alevel <= mpeg1_max_level[0][run]) {
code = mpeg1_index_run[0][run] + alevel - 1; code = mpeg1_index_run[0][run] + alevel - 1;
/* store the vlc & sign at once */ /* store the VLC & sign at once */
put_bits(&s->pb, table_vlc[code][1]+1, (table_vlc[code][0]<<1) + sign); put_bits(&s->pb, table_vlc[code][1] + 1,
(table_vlc[code][0] << 1) + sign);
} else { } else {
/* escape seems to be pretty rare <5% so I do not optimize it */ /* escape seems to be pretty rare <5% so I do not optimize it */
put_bits(&s->pb, table_vlc[111][1], table_vlc[111][0]); put_bits(&s->pb, table_vlc[111][1], table_vlc[111][0]);
@@ -568,12 +584,11 @@ static void mpeg1_encode_block(MpegEncContext *s,
if (alevel < 128) { if (alevel < 128) {
put_sbits(&s->pb, 8, level); put_sbits(&s->pb, 8, level);
} else { } else {
if (level < 0) { if (level < 0)
put_bits(&s->pb, 16, 0x8001 + level + 255); put_bits(&s->pb, 16, 0x8001 + level + 255);
} else { else
put_sbits(&s->pb, 16, level); put_sbits(&s->pb, 16, level);
} }
}
} else { } else {
put_sbits(&s->pb, 12, level); put_sbits(&s->pb, 12, level);
} }
@@ -597,24 +612,31 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
/* compute cbp */ /* compute cbp */
cbp = 0; cbp = 0;
for(i=0;i<mb_block_count;i++) { for (i = 0; i < mb_block_count; i++)
if (s->block_last_index[i] >= 0) if (s->block_last_index[i] >= 0)
cbp |= 1 << (mb_block_count - 1 - i); cbp |= 1 << (mb_block_count - 1 - i);
}
if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 && if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 &&
(mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)) && (mb_x != s->mb_width - 1 ||
(mb_y != s->mb_height - 1 && s->codec_id == AV_CODEC_ID_MPEG1VIDEO)) &&
((s->pict_type == AV_PICTURE_TYPE_P && (motion_x | motion_y) == 0) || ((s->pict_type == AV_PICTURE_TYPE_P && (motion_x | motion_y) == 0) ||
(s->pict_type == AV_PICTURE_TYPE_B && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD) ? ((s->mv[0][0][0] - s->last_mv[0][0][0])|(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) | (s->pict_type == AV_PICTURE_TYPE_B && s->mv_dir == s->last_mv_dir &&
((s->mv_dir & MV_DIR_BACKWARD) ? ((s->mv[1][0][0] - s->last_mv[1][0][0])|(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) { (((s->mv_dir & MV_DIR_FORWARD)
? ((s->mv[0][0][0] - s->last_mv[0][0][0]) |
(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) |
((s->mv_dir & MV_DIR_BACKWARD)
? ((s->mv[1][0][0] - s->last_mv[1][0][0]) |
(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) {
s->mb_skip_run++; s->mb_skip_run++;
s->qscale -= s->dquant; s->qscale -= s->dquant;
s->skip_count++; s->skip_count++;
s->misc_bits++; s->misc_bits++;
s->last_bits++; s->last_bits++;
if (s->pict_type == AV_PICTURE_TYPE_P) { if (s->pict_type == AV_PICTURE_TYPE_P) {
s->last_mv[0][1][0]= s->last_mv[0][0][0]= s->last_mv[0][0][0] =
s->last_mv[0][1][1]= s->last_mv[0][0][1]= 0; s->last_mv[0][0][1] =
s->last_mv[0][1][0] =
s->last_mv[0][1][1] = 0;
} }
} else { } else {
if (first_mb) { if (first_mb) {
@@ -626,10 +648,12 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
if (s->pict_type == AV_PICTURE_TYPE_I) { if (s->pict_type == AV_PICTURE_TYPE_I) {
if (s->dquant && cbp) { if (s->dquant && cbp) {
put_mb_modes(s, 2, 1, 0, 0); /* macroblock_type : macroblock_quant = 1 */ /* macroblock_type: macroblock_quant = 1 */
put_mb_modes(s, 2, 1, 0, 0);
put_qscale(s); put_qscale(s);
} else { } else {
put_mb_modes(s, 1, 1, 0, 0); /* macroblock_type : macroblock_quant = 0 */ /* macroblock_type: macroblock_quant = 0 */
put_mb_modes(s, 1, 1, 0, 0);
s->qscale -= s->dquant; s->qscale -= s->dquant;
} }
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
@@ -650,10 +674,12 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
if (cbp != 0) { if (cbp != 0) {
if ((motion_x | motion_y) == 0) { if ((motion_x | motion_y) == 0) {
if (s->dquant) { if (s->dquant) {
put_mb_modes(s, 5, 1, 0, 0); /* macroblock_pattern & quant */ /* macroblock_pattern & quant */
put_mb_modes(s, 5, 1, 0, 0);
put_qscale(s); put_qscale(s);
} else { } else {
put_mb_modes(s, 2, 1, 0, 0); /* macroblock_pattern only */ /* macroblock_pattern only */
put_mb_modes(s, 2, 1, 0, 0);
} }
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
} else { } else {
@@ -664,8 +690,14 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
put_mb_modes(s, 1, 1, 1, 0); /* motion + cbp */ put_mb_modes(s, 1, 1, 1, 0); /* motion + cbp */
} }
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added // RAL: f_code parameter added
mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added mpeg1_encode_motion(s,
motion_x - s->last_mv[0][0][0],
s->f_code);
// RAL: f_code parameter added
mpeg1_encode_motion(s,
motion_y - s->last_mv[0][0][1],
s->f_code);
s->mv_bits += get_bits_diff(s); s->mv_bits += get_bits_diff(s);
} }
} else { } else {
@@ -673,8 +705,14 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
if (!s->frame_pred_frame_dct) if (!s->frame_pred_frame_dct)
put_bits(&s->pb, 2, 2); /* motion_type: frame */ put_bits(&s->pb, 2, 2); /* motion_type: frame */
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
mpeg1_encode_motion(s, motion_x - s->last_mv[0][0][0], s->f_code); // RAL: f_code parameter added // RAL: f_code parameter added
mpeg1_encode_motion(s, motion_y - s->last_mv[0][0][1], s->f_code); // RAL: f_code parameter added mpeg1_encode_motion(s,
motion_x - s->last_mv[0][0][0],
s->f_code);
// RAL: f_code parameter added
mpeg1_encode_motion(s,
motion_y - s->last_mv[0][0][1],
s->f_code);
s->qscale -= s->dquant; s->qscale -= s->dquant;
s->mv_bits += get_bits_diff(s); s->mv_bits += get_bits_diff(s);
} }
@@ -698,8 +736,12 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
put_bits(&s->pb, 1, s->field_select[0][i]); put_bits(&s->pb, 1, s->field_select[0][i]);
mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code); mpeg1_encode_motion(s,
mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code); s->mv[0][i][0] - s->last_mv[0][i][0],
s->f_code);
mpeg1_encode_motion(s,
s->mv[0][i][1] - (s->last_mv[0][i][1] >> 1),
s->f_code);
s->last_mv[0][i][0] = s->mv[0][i][0]; s->last_mv[0][i][0] = s->mv[0][i][0];
s->last_mv[0][i][1] = 2 * s->mv[0][i][1]; s->last_mv[0][i][1] = 2 * s->mv[0][i][1];
} }
@@ -707,9 +749,13 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
} }
if (cbp) { if (cbp) {
if (s->chroma_y_shift) { if (s->chroma_y_shift) {
put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp][1], ff_mpeg12_mbPatTable[cbp][0]); put_bits(&s->pb,
ff_mpeg12_mbPatTable[cbp][1],
ff_mpeg12_mbPatTable[cbp][0]);
} else { } else {
put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp>>2][1], ff_mpeg12_mbPatTable[cbp>>2][0]); put_bits(&s->pb,
ff_mpeg12_mbPatTable[cbp >> 2][1],
ff_mpeg12_mbPatTable[cbp >> 2][0]);
put_sbits(&s->pb, 2, cbp); put_sbits(&s->pb, 2, cbp);
} }
} }
@@ -734,17 +780,29 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
} }
s->misc_bits += get_bits_diff(s); s->misc_bits += get_bits_diff(s);
if (s->mv_dir & MV_DIR_FORWARD) { if (s->mv_dir & MV_DIR_FORWARD) {
mpeg1_encode_motion(s, s->mv[0][0][0] - s->last_mv[0][0][0], s->f_code); mpeg1_encode_motion(s,
mpeg1_encode_motion(s, s->mv[0][0][1] - s->last_mv[0][0][1], s->f_code); s->mv[0][0][0] - s->last_mv[0][0][0],
s->last_mv[0][0][0]=s->last_mv[0][1][0]= s->mv[0][0][0]; s->f_code);
s->last_mv[0][0][1]=s->last_mv[0][1][1]= s->mv[0][0][1]; mpeg1_encode_motion(s,
s->mv[0][0][1] - s->last_mv[0][0][1],
s->f_code);
s->last_mv[0][0][0] =
s->last_mv[0][1][0] = s->mv[0][0][0];
s->last_mv[0][0][1] =
s->last_mv[0][1][1] = s->mv[0][0][1];
s->f_count++; s->f_count++;
} }
if (s->mv_dir & MV_DIR_BACKWARD) { if (s->mv_dir & MV_DIR_BACKWARD) {
mpeg1_encode_motion(s, s->mv[1][0][0] - s->last_mv[1][0][0], s->b_code); mpeg1_encode_motion(s,
mpeg1_encode_motion(s, s->mv[1][0][1] - s->last_mv[1][0][1], s->b_code); s->mv[1][0][0] - s->last_mv[1][0][0],
s->last_mv[1][0][0]=s->last_mv[1][1][0]= s->mv[1][0][0]; s->b_code);
s->last_mv[1][0][1]=s->last_mv[1][1][1]= s->mv[1][0][1]; mpeg1_encode_motion(s,
s->mv[1][0][1] - s->last_mv[1][0][1],
s->b_code);
s->last_mv[1][0][0] =
s->last_mv[1][1][0] = s->mv[1][0][0];
s->last_mv[1][0][1] =
s->last_mv[1][1][1] = s->mv[1][0][1];
s->b_count++; s->b_count++;
} }
} else { } else {
@@ -769,20 +827,28 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
if (s->mv_dir & MV_DIR_FORWARD) { if (s->mv_dir & MV_DIR_FORWARD) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
put_bits(&s->pb, 1, s->field_select[0][i]); put_bits(&s->pb, 1, s->field_select[0][i]);
mpeg1_encode_motion(s, s->mv[0][i][0] - s->last_mv[0][i][0] , s->f_code); mpeg1_encode_motion(s,
mpeg1_encode_motion(s, s->mv[0][i][1] - (s->last_mv[0][i][1]>>1), s->f_code); s->mv[0][i][0] - s->last_mv[0][i][0],
s->f_code);
mpeg1_encode_motion(s,
s->mv[0][i][1] - (s->last_mv[0][i][1] >> 1),
s->f_code);
s->last_mv[0][i][0] = s->mv[0][i][0]; s->last_mv[0][i][0] = s->mv[0][i][0];
s->last_mv[0][i][1]= 2*s->mv[0][i][1]; s->last_mv[0][i][1] = s->mv[0][i][1] * 2;
} }
s->f_count++; s->f_count++;
} }
if (s->mv_dir & MV_DIR_BACKWARD) { if (s->mv_dir & MV_DIR_BACKWARD) {
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
put_bits(&s->pb, 1, s->field_select[1][i]); put_bits(&s->pb, 1, s->field_select[1][i]);
mpeg1_encode_motion(s, s->mv[1][i][0] - s->last_mv[1][i][0] , s->b_code); mpeg1_encode_motion(s,
mpeg1_encode_motion(s, s->mv[1][i][1] - (s->last_mv[1][i][1]>>1), s->b_code); s->mv[1][i][0] - s->last_mv[1][i][0],
s->b_code);
mpeg1_encode_motion(s,
s->mv[1][i][1] - (s->last_mv[1][i][1] >> 1),
s->b_code);
s->last_mv[1][i][0] = s->mv[1][i][0]; s->last_mv[1][i][0] = s->mv[1][i][0];
s->last_mv[1][i][1]= 2*s->mv[1][i][1]; s->last_mv[1][i][1] = s->mv[1][i][1] * 2;
} }
s->b_count++; s->b_count++;
} }
@@ -790,18 +856,20 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
s->mv_bits += get_bits_diff(s); s->mv_bits += get_bits_diff(s);
if (cbp) { if (cbp) {
if (s->chroma_y_shift) { if (s->chroma_y_shift) {
put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp][1], ff_mpeg12_mbPatTable[cbp][0]); put_bits(&s->pb,
ff_mpeg12_mbPatTable[cbp][1],
ff_mpeg12_mbPatTable[cbp][0]);
} else { } else {
put_bits(&s->pb, ff_mpeg12_mbPatTable[cbp>>2][1], ff_mpeg12_mbPatTable[cbp>>2][0]); put_bits(&s->pb,
ff_mpeg12_mbPatTable[cbp >> 2][1],
ff_mpeg12_mbPatTable[cbp >> 2][0]);
put_sbits(&s->pb, 2, cbp); put_sbits(&s->pb, 2, cbp);
} }
} }
} }
for(i=0;i<mb_block_count;i++) { for (i = 0; i < mb_block_count; i++)
if (cbp & (1 << (mb_block_count - 1 - i))) { if (cbp & (1 << (mb_block_count - 1 - i)))
mpeg1_encode_block(s, block[i], i); mpeg1_encode_block(s, block[i], i);
}
}
s->mb_skip_run = 0; s->mb_skip_run = 0;
if (s->mb_intra) if (s->mb_intra)
s->i_tex_bits += get_bits_diff(s); s->i_tex_bits += get_bits_diff(s);
@@ -810,10 +878,13 @@ static av_always_inline void mpeg1_encode_mb_internal(MpegEncContext *s,
} }
} }
void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[6][64], int motion_x, int motion_y) void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t 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); if (s->chroma_format == CHROMA_420)
else mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8); mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 6);
else
mpeg1_encode_mb_internal(s, block, motion_x, motion_y, 8);
} }
av_cold void ff_mpeg1_encode_init(MpegEncContext *s) av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
@@ -831,8 +902,7 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
ff_init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); ff_init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
ff_init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); ff_init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
for(i=0; i<64; i++) for (i = 0; i < 64; i++) {
{
mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i]; mpeg1_max_level[0][i] = ff_rl_mpeg1.max_level[0][i];
mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i]; mpeg1_index_run[0][i] = ff_rl_mpeg1.index_run[0][i];
} }
@@ -842,31 +912,34 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len); init_uni_ac_vlc(&ff_rl_mpeg2, uni_mpeg2_ac_vlc_len);
/* build unified dc encoding tables */ /* build unified dc encoding tables */
for(i=-255; i<256; i++) for (i = -255; i < 256; i++) {
{
int adiff, index; int adiff, index;
int bits, code; int bits, code;
int diff = i; int diff = i;
adiff = FFABS(diff); adiff = FFABS(diff);
if(diff<0) diff--; if (diff < 0)
diff--;
index = av_log2(2 * adiff); index = av_log2(2 * adiff);
bits = ff_mpeg12_vlc_dc_lum_bits[index] + index; bits = ff_mpeg12_vlc_dc_lum_bits[index] + index;
code= (ff_mpeg12_vlc_dc_lum_code[index]<<index) + (diff & ((1 << index) - 1)); code = (ff_mpeg12_vlc_dc_lum_code[index] << index) +
(diff & ((1 << index) - 1));
mpeg1_lum_dc_uni[i + 255] = bits + (code << 8); mpeg1_lum_dc_uni[i + 255] = bits + (code << 8);
bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index; bits = ff_mpeg12_vlc_dc_chroma_bits[index] + index;
code= (ff_mpeg12_vlc_dc_chroma_code[index]<<index) + (diff & ((1 << index) - 1)); code = (ff_mpeg12_vlc_dc_chroma_code[index] << index) +
(diff & ((1 << index) - 1));
mpeg1_chr_dc_uni[i + 255] = bits + (code << 8); mpeg1_chr_dc_uni[i + 255] = bits + (code << 8);
} }
for(f_code=1; f_code<=MAX_FCODE; f_code++){ for (f_code = 1; f_code <= MAX_FCODE; f_code++)
for (mv = -MAX_MV; mv <= MAX_MV; mv++) { for (mv = -MAX_MV; mv <= MAX_MV; mv++) {
int len; int len;
if(mv==0) len= ff_mpeg12_mbMotionVectorTable[0][1]; if (mv == 0) {
else{ len = ff_mpeg12_mbMotionVectorTable[0][1];
} else {
int val, bit_size, code; int val, bit_size, code;
bit_size = f_code - 1; bit_size = f_code - 1;
@@ -876,24 +949,22 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
val = -val; val = -val;
val--; val--;
code = (val >> bit_size) + 1; code = (val >> bit_size) + 1;
if(code<17){ if (code < 17)
len= ff_mpeg12_mbMotionVectorTable[code][1] + 1 + bit_size; len = ff_mpeg12_mbMotionVectorTable[code][1] +
}else{ 1 + bit_size;
len= ff_mpeg12_mbMotionVectorTable[16][1] + 2 + bit_size; else
} len = ff_mpeg12_mbMotionVectorTable[16][1] +
2 + bit_size;
} }
mv_penalty[f_code][mv + MAX_MV] = len; mv_penalty[f_code][mv + MAX_MV] = len;
} }
}
for(f_code=MAX_FCODE; f_code>0; f_code--){ for (f_code = MAX_FCODE; f_code > 0; f_code--)
for(mv=-(8<<f_code); mv<(8<<f_code); mv++){ for (mv = -(8 << f_code); mv < (8 << f_code); mv++)
fcode_tab[mv + MAX_MV] = f_code; fcode_tab[mv + MAX_MV] = f_code;
} }
}
}
s->me.mv_penalty = mv_penalty; s->me.mv_penalty = mv_penalty;
s->fcode_tab = fcode_tab; s->fcode_tab = fcode_tab;
if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) { if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
@@ -917,9 +988,12 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s)
#define OFFSET(x) offsetof(MpegEncContext, x) #define OFFSET(x) offsetof(MpegEncContext, x)
#define VE AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM #define VE AV_OPT_FLAG_ENCODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM
#define COMMON_OPTS \ #define COMMON_OPTS \
{ "intra_vlc", "Use MPEG-2 intra VLC table.", OFFSET(intra_vlc_format), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },\ { "intra_vlc", "Use MPEG-2 intra VLC table.", \
{ "drop_frame_timecode", "Timecode is in drop frame format.", OFFSET(drop_frame_timecode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE}, \ OFFSET(intra_vlc_format), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \
{ "scan_offset", "Reserve space for SVCD scan offset user data.", OFFSET(scan_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "drop_frame_timecode", "Timecode is in drop frame format.", \
OFFSET(drop_frame_timecode), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \
{ "scan_offset", "Reserve space for SVCD scan offset user data.", \
OFFSET(scan_offset), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE },
static const AVOption mpeg1_options[] = { static const AVOption mpeg1_options[] = {
COMMON_OPTS COMMON_OPTS
@@ -971,9 +1045,9 @@ AVCodec ff_mpeg2video_encoder = {
.encode2 = ff_MPV_encode_picture, .encode2 = ff_MPV_encode_picture,
.close = ff_MPV_encode_end, .close = ff_MPV_encode_end,
.supported_framerates = ff_mpeg12_frame_rate_tab + 1, .supported_framerates = ff_mpeg12_frame_rate_tab + 1,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE AV_PIX_FMT_YUV422P,
}, AV_PIX_FMT_NONE },
.capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"), .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 video"),
.priv_class = &mpeg2_class, .priv_class = &mpeg2_class,