Hi,
On Sat, Dec 24, 2011 at 8:49 PM, Ronald S. Bultje <[email protected]>wrote:
> Until line 2072.
>
> @@ -2071,23 +2122,23 @@ static int encode_thread(AVCodecContext *c, void
*arg){
[..]
> + s->last_bits = put_bits_count(&s->pb);
> + s->mv_bits = 0;
> + s->misc_bits = 0;
> + s->i_tex_bits = 0;
> + s->p_tex_bits = 0;
> + s->i_count = 0;
> + s->f_count = 0;
> + s->b_count = 0;
> + s->skip_count = 0;
Vertically align '='.
> @@ -2107,37 +2158,37 @@ static int encode_thread(AVCodecContext *c, void
*arg){
[..]
> + for (mb_y= s->start_mb_y; mb_y < s->end_mb_y; mb_y++) {
> // printf("row %d at %X\n", s->mb_y, (int)s);
Mis-indented commented code.
> + for (mb_x = 0; mb_x < s->mb_width; mb_x++) {
> + int xy = mb_y * s->mb_stride + mb_x; // removed const, H261
needs to adjust this
>80 characters.
> + int mb_type = s->mb_type[xy];
> // int d;
Mis-indented commented code.
> + if (s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb) >>
3) < MAX_MB_BYTES) {
>80 characters.
> + if (s->data_partitioning) {
> + if ( s->pb2 .buf_end - s->pb2 .buf -
(put_bits_count(&s-> pb2) >> 3) < MAX_MB_BYTES
> + || s->tex_pb.buf_end - s->tex_pb.buf -
(put_bits_count(&s->tex_pb ) >> 3) < MAX_MB_BYTES) {
> av_log(s->avctx, AV_LOG_ERROR, "encoded frame too
large\n");
> return -1;
> }
>80 characters, "||" goes on the line above.
> + current_packet_size = ((put_bits_count(&s->pb) + 7) >>
3) - (s->ptr_lastgob - s->pb.buf);
>80 characters.
> + is_gob_start= s->avctx->rtp_payload_size &&
current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x > 0;
Same.
> + if (CONFIG_MPEG4_ENCODER &&
s->codec_id==CODEC_ID_MPEG4 && s->partitioned_frame) {
Same.
> + if (s->avctx->error_rate && s->resync_mb_x +
s->resync_mb_y > 0) {
> + int r = put_bits_count(&s->pb) / 8 +
s->picture_number + 16 + s->mb_x + s->mb_y;
Same x2.
> + if (s->avctx->rtp_callback) {
> + int number_mb = (mb_y - s->resync_mb_y) *
s->mb_width + mb_x - s->resync_mb_x;
> s->avctx->rtp_callback(s->avctx, s->ptr_lastgob,
current_packet_size, number_mb);
> }
Same x2.
> @@ -2224,103 +2279,103 @@ static int encode_thread(AVCodecContext *c,
void *arg){
[..]
> + if (s->flags&CODEC_FLAG_PASS1) {
Spaces around &.
> + if ( (s->resync_mb_x == s->mb_x)
> + && s->resync_mb_y + 1 == s->mb_y) {
> + s->first_slice_line = 0;
> }
&& goes on previous line.
> + s->mb_skipped = 0;
> + s->dquant = 0; //only for QP_RD
Space between "//" and comment text.
> + if (mb_type & (mb_type - 1) || (s->flags &
CODEC_FLAG_QP_RD)) { // more than 1 MB type possible or CODEC_FLAG_QP_RD
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_INTER) {
Spaces around &.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_INTER, pb, pb2, tex_pb,
> &dmin, &next_block, s->mv[0][0][0],
s->mv[0][0][1]);
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_INTER_I) {
Spaces around &.
> + j = s->field_select[0][i] =
s->p_field_select_table[i][xy];
>80 characters.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_INTER_I, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
Same.
> + if (mb_type&CANDIDATE_MB_TYPE_SKIPPED) {
Spaces around &.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_SKIPPED, pb, pb2, tex_pb,
> &dmin, &next_block, s->mv[0][0][0],
s->mv[0][0][1]);
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_INTER4V) {
Spaces around &.
> + for (i = 0; i < 4; i++) {
> s->mv[0][i][0] =
s->current_picture.f.motion_val[0][s->block_index[i]][0];
> s->mv[0][i][1] =
s->current_picture.f.motion_val[0][s->block_index[i]][1];
> }
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_INTER4V, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_FORWARD) {
Spaces around &.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_FORWARD, pb, pb2, tex_pb,
> &dmin, &next_block, s->mv[0][0][0],
s->mv[0][0][1]);
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_BACKWARD) {
Spaces around &.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_BACKWARD, pb, pb2, tex_pb,
> &dmin, &next_block, s->mv[1][0][0],
s->mv[1][0][1]);
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_BIDIR) {
Spaces around &.
> @@ -2328,37 +2383,37 @@ static int encode_thread(AVCodecContext *c, void
*arg){
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_BIDIR, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters.
> + if (mb_type&CANDIDATE_MB_TYPE_FORWARD_I) {
Spaces around &.
> + for (i = 0; i < 2; i++) {
> + j = s->field_select[0][i] =
s->b_field_select_table[0][i][xy];
> s->mv[0][i][0] =
s->b_field_mv_table[0][i][j][xy][0];
> s->mv[0][i][1] =
s->b_field_mv_table[0][i][j][xy][1];
> }
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_FORWARD_I, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters x2.
> + if (mb_type&CANDIDATE_MB_TYPE_BACKWARD_I) {
Spaces around &.
> + for (i = 0; i < 2; i++) {
> + j = s->field_select[1][i] =
s->b_field_select_table[1][i][xy];
> s->mv[1][i][0] =
s->b_field_mv_table[1][i][j][xy][0];
> s->mv[1][i][1] =
s->b_field_mv_table[1][i][j][xy][1];
> }
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_BACKWARD_I, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters x2.
> + if (mb_type&CANDIDATE_MB_TYPE_BIDIR_I) {
Spaces around &.
> + for (i = 0; i < 2; i++) {
> + j = s->field_select[dir][i] =
s->b_field_select_table[dir][i][xy];
> s->mv[dir][i][0] =
s->b_field_mv_table[dir][i][j][xy][0];
> s->mv[dir][i][1] =
s->b_field_mv_table[dir][i][j][xy][1];
> }
>80 characters.
> @@ -2366,117 +2421,117 @@ static int encode_thread(AVCodecContext *c,
void *arg){
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_BIDIR_I, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_INTRA, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters.
> + if ((s->flags & CODEC_FLAG_QP_RD) && dmin < INT_MAX) {
> + if (best_s.mv_type == MV_TYPE_16X16) { //FIXME move
4mv after QPRD
>80 characters.
> + s->mv_dir = best_s.mv_dir;
> + s->mv_type = MV_TYPE_16X16;
> + s->mb_intra = best_s.mb_intra;
> s->mv[0][0][0] = best_s.mv[0][0][0];
> s->mv[0][0][1] = best_s.mv[0][0][1];
> s->mv[1][0][0] = best_s.mv[1][0][0];
> s->mv[1][0][1] = best_s.mv[1][0][1];
Vertically align '='.
> + if (s->mb_intra && s->dc_val[0]) {
> + for (i = 0; i < 6; i++) {
> + dc[i] =
s->dc_val[0][s->block_index[i]];
> + memcpy(ac[i],
s->ac_val[0][s->block_index[i]], sizeof(DCTELEM) * 16);
> }
> }
>80 characters.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb,
> &dmin, &next_block,
s->mv[mvdir][0][0], s->mv[mvdir][0][1]);
Same.
> + if (best_s.qscale != qp) {
> + if (s->mb_intra && s->dc_val[0]) {
> + for (i = 0; i < 6; i++) {
> + s->dc_val[0][ s->block_index[i]
] = dc[i];
> +
memcpy(s->ac_val[0][s->block_index[i]], ac[i], sizeof(DCTELEM) * 16);
> }
> }
> }
>80 characters, and remove spaces after [ and before ].
> + if (CONFIG_MPEG4_ENCODER &&
mb_type&CANDIDATE_MB_TYPE_DIRECT) {
Spaces around &; and if you do that, it'll be >80 characters so please
split it over 2 lines.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb,
> &dmin, &next_block, mx, my);
>80 characters.
> + if (CONFIG_MPEG4_ENCODER &&
mb_type&CANDIDATE_MB_TYPE_DIRECT0) {
Spaces around &.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_DIRECT, pb, pb2, tex_pb,
> &dmin, &next_block, 0, 0);
>80 characters.
> + if (!best_s.mb_intra && s->flags2&CODEC_FLAG2_SKIP_RD) {
Spaces around &.
> + mx = my = 0; //FIXME find the one we
actually used
Space between "//" and comment text.
> + } else if (best_s.mv_dir&MV_DIR_BACKWARD) {
Spaces around &.
> encode_mb_hq(s, &backup_s, &best_s,
CANDIDATE_MB_TYPE_INTER /* wrong but unused */, pb, pb2, tex_pb,
> &dmin, &next_block, mx, my);
>80 characters.
Until line 2489.
Ronald
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
