libavcodec.hg: h263.c comparison

comparison h263.c @ 1661:4c9fd29f1606 libavcodec

h263 slice structured mode slice cleanup

author	michael
date	Sun, 07 Dec 2003 01:33:45 +0000
parents	3075fc11a974
children	4ac3573977e6

comparison

equal deleted inserted replaced

-:806afb8e9085
+:4c9fd29f1606
 align_put_bits(&s->pb);
 /* Update the pointer to last GOB */
 s->ptr_lastgob = pbBufPtr(&s->pb);
-s->gob_number = 0;
 put_bits(&s->pb, 22, 0x20); /* PSC */
 put_bits(&s->pb, 8, (((int64_t)s->picture_number * 30 * s->avctx->frame_rate_base) /
 s->avctx->frame_rate) & 0xff);
 put_bits(&s->pb, 1, 1);	/* marker */
 put_bits(&s->pb,3,6); /* Custom Source Format */
 else
 put_bits(&s->pb, 3, format);
 put_bits(&s->pb,1,0); /* Custom PCF: off */
-put_bits(&s->pb, 1, s->umvplus); /* Unrestricted Motion Vector */
+put_bits(&s->pb,1, s->umvplus); /* Unrestricted Motion Vector */
 put_bits(&s->pb,1,0); /* SAC: off */
 put_bits(&s->pb,1,s->obmc); /* Advanced Prediction Mode */
 put_bits(&s->pb,1,s->h263_aic); /* Advanced Intra Coding */
 put_bits(&s->pb,1,s->loop_filter); /* Deblocking Filter */
-put_bits(&s->pb,1,0); /* Slice Structured: off */
+put_bits(&s->pb,1,s->h263_slice_structured); /* Slice Structured */
 put_bits(&s->pb,1,0); /* Reference Picture Selection: off */
 put_bits(&s->pb,1,0); /* Independent Segment Decoding: off */
 put_bits(&s->pb,1,s->alt_inter_vlc); /* Alternative Inter VLC */
 put_bits(&s->pb,1,s->modified_quant); /* Modified Quantization: */
 put_bits(&s->pb,1,1); /* "1" to prevent start code emulation */
 /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */
 if (s->umvplus)
 //            put_bits(&s->pb,1,1); /* Limited according tables of Annex D */
 //FIXME check actual requested range
 put_bits(&s->pb,2,1); /* unlimited */
+if(s->h263_slice_structured)
+put_bits(&s->pb,2,0); /* no weird submodes */
 put_bits(&s->pb, 5, s->qscale);
 }
 put_bits(&s->pb, 1, 0);	/* no PEI */
 }
 /**
 * Encodes a group of blocks header.
 */
-int h263_encode_gob_header(MpegEncContext * s, int mb_line)
+void h263_encode_gob_header(MpegEncContext * s, int mb_line)
 {
-align_put_bits(&s->pb);
+put_bits(&s->pb, 17, 1); /* GBSC */
-flush_put_bits(&s->pb);
-/* Call the RTP callback to send the last GOB */
+if(s->h263_slice_structured){
-if (s->rtp_callback) {
+put_bits(&s->pb, 1, 1);
-int pdif = pbBufPtr(&s->pb) - s->ptr_lastgob;
-s->rtp_callback(s->ptr_lastgob, pdif, s->gob_number);
+ff_h263_encode_mba(s);
-}
-put_bits(&s->pb, 17, 1); /* GBSC */
+if(s->mb_num > 1583)
-s->gob_number = mb_line / s->gob_index;
+put_bits(&s->pb, 1, 1);
-put_bits(&s->pb, 5, s->gob_number); /* GN */
+put_bits(&s->pb, 5, s->qscale); /* GQUANT */
-put_bits(&s->pb, 2, s->pict_type == I_TYPE); /* GFID */
+put_bits(&s->pb, 1, 1);
-put_bits(&s->pb, 5, s->qscale); /* GQUANT */
+put_bits(&s->pb, 2, s->pict_type == I_TYPE); /* GFID */
-//fprintf(stderr,"\nGOB: %2d size: %d", s->gob_number - 1, pdif);
+}else{
-return 0;
+int gob_number= mb_line / s->gob_index;
+put_bits(&s->pb, 5, gob_number); /* GN */
+put_bits(&s->pb, 2, s->pict_type == I_TYPE); /* GFID */
+put_bits(&s->pb, 5, s->qscale); /* GQUANT */
+}
 }
 static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int block_last_index, uint8_t scantable[64]){
 int last=0;
 int j;
 return  2;
 else
 return 4;
 }
+int ff_h263_decode_mba(MpegEncContext *s)
+{
+int i, mb_pos;
+for(i=0; i<6; i++){
+if(s->mb_num < ff_mba_max[i]) break;
+}
+mb_pos= get_bits(&s->gb, ff_mba_length[i]);
+s->mb_x= mb_pos % s->mb_width;
+s->mb_y= mb_pos / s->mb_width;
+return mb_pos;
+}
+void ff_h263_encode_mba(MpegEncContext *s)
+{
+int i, mb_pos;
+for(i=0; i<6; i++){
+if(s->mb_num < ff_mba_max[i]) break;
+}
+mb_pos= s->mb_x + s->mb_width*s->mb_y;
+put_bits(&s->pb, ff_mba_length[i], mb_pos);
+}
 /**
-* decodes the group of blocks header.
+* decodes the group of blocks header or slice header.
 * @return <0 if an error occured
 */
 static int h263_decode_gob_header(MpegEncContext *s)
 {
-unsigned int val, gfid;
+unsigned int val, gfid, gob_number;
 int left;
 /* Check for GOB Start Code */
 val = show_bits(&s->gb, 16);
 if(val)
 if(get_bits1(&s->gb)) break; /* Seek the '1' bit */
 }
 if(left<=13)
 return -1;
-#ifdef DEBUG
+if(s->h263_slice_structured){
-fprintf(stderr,"\nGOB Start Code at MB %d\n", (s->mb_y * s->mb_width) + s->mb_x);
+if(get_bits1(&s->gb)==0)
-#endif
+return -1;
-s->gob_number = get_bits(&s->gb, 5); /* GN */
-gfid = get_bits(&s->gb, 2); /* GFID */
+ff_h263_decode_mba(s);
-s->qscale = get_bits(&s->gb, 5); /* GQUANT */
+if(s->mb_num > 1583)
+if(get_bits1(&s->gb)==0)
+return -1;
+s->qscale = get_bits(&s->gb, 5); /* SQUANT */
+if(get_bits1(&s->gb)==0)
+return -1;
+gfid = get_bits(&s->gb, 2); /* GFID */
+}else{
+gob_number = get_bits(&s->gb, 5); /* GN */
+s->mb_x= 0;
+s->mb_y= s->gob_index* gob_number;
+gfid = get_bits(&s->gb, 2); /* GFID */
+s->qscale = get_bits(&s->gb, 5); /* GQUANT */
+}
+if(s->mb_y >= s->mb_height)
+return -1;
 if(s->qscale==0)
 return -1;
-s->mb_x= 0;
-s->mb_y= s->gob_index* s->gob_number;
-if(s->mb_y >= s->mb_height)
-return -1;
-#ifdef DEBUG
-fprintf(stderr, "\nGN: %u GFID: %u Quant: %u\n", s->gob_number, gfid, s->qscale);
-#endif
 return 0;
 }
 static inline void memsetw(short *tab, int val, int n)
 {
 void ff_mpeg4_encode_video_packet_header(MpegEncContext *s)
 {
 int mb_num_bits= av_log2(s->mb_num - 1) + 1;
-ff_mpeg4_stuffing(&s->pb);
 put_bits(&s->pb, ff_mpeg4_get_video_packet_prefix_length(s), 0);
 put_bits(&s->pb, 1, 1);
 put_bits(&s->pb, mb_num_bits, s->mb_x + s->mb_y*s->mb_width);
 put_bits(&s->pb, s->quant_precision, s->qscale);
 }
 skip_bits1(&s->gb);	/* split screen off */
 skip_bits1(&s->gb);	/* camera  off */
 skip_bits1(&s->gb);	/* freeze picture release off */
-/* Reset GOB number */
-s->gob_number = 0;
 format = get_bits(&s->gb, 3);
 /*
 0    forbidden
 1    sub-QCIF
 10   QCIF
 s->obmc= get_bits1(&s->gb); /* Advanced prediction mode */
 s->h263_aic = get_bits1(&s->gb); /* Advanced Intra Coding (AIC) */
 s->loop_filter= get_bits1(&s->gb);
 s->unrestricted_mv = s->umvplus || s->obmc || s->loop_filter;
-if (get_bits1(&s->gb) != 0) {
+s->h263_slice_structured= get_bits1(&s->gb);
-av_log(s->avctx, AV_LOG_ERROR, "Slice Structured not supported\n");
-}
 if (get_bits1(&s->gb) != 0) {
 av_log(s->avctx, AV_LOG_ERROR, "Reference Picture Selection not supported\n");
 }
 if (get_bits1(&s->gb) != 0) {
 av_log(s->avctx, AV_LOG_ERROR, "Independent Segment Decoding not supported\n");
 s->height = height;
 if (s->umvplus) {
 if(get_bits1(&s->gb)==0) /* Unlimited Unrestricted Motion Vectors Indicator (UUI) */
 skip_bits1(&s->gb);
 }
+if(s->h263_slice_structured){
+if (get_bits1(&s->gb) != 0) {
+av_log(s->avctx, AV_LOG_ERROR, "rectangular slices not supported\n");
+}
+if (get_bits1(&s->gb) != 0) {
+av_log(s->avctx, AV_LOG_ERROR, "unordered slices not supported\n");
+}
+}
 }
 s->qscale = get_bits(&s->gb, 5);
 }
 /* PEI */
 s->y_dc_scale_table=
 s->c_dc_scale_table= ff_mpeg1_dc_scale_table;
 }
 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
-av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s\n",
+av_log(s->avctx, AV_LOG_DEBUG, "qp:%d %c size:%d rnd:%d%s%s%s%s%s%s%s%s%s\n",
 s->qscale, av_get_pict_type_char(s->pict_type),
 s->gb.size_in_bits, 1-s->no_rounding,
 s->obmc ? " AP" : "",
 s->umvplus ? " UMV" : "",
 s->h263_long_vectors ? " LONG" : "",
 s->h263_plus ? " +" : "",
 s->h263_aic ? " AIC" : "",
 s->alt_inter_vlc ? " AIV" : "",
 s->modified_quant ? " MQ" : "",
-s->loop_filter ? " LOOP" : ""
+s->loop_filter ? " LOOP" : "",
+s->h263_slice_structured ? " SS" : ""
 );
 }
 #if 1
 if (s->pict_type == I_TYPE && s->avctx->codec_tag == ff_get_fourcc("ZYGO")){
 int i,j;

Mercurial > libavcodec.hg

comparison h263.c @ 1661:4c9fd29f1606 libavcodec