virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'b78f81c8033904e2e75add0c9a603df6df514a30'

Browse Source 
* commit 'b78f81c8033904e2e75add0c9a603df6df514a30':
  h261: K&R formatting and prettyprinting cosmetics

Conflicts:
	libavcodec/h261_parser.c
	libavcodec/h261data.h
	libavcodec/h261dec.c
	libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-05 21:53:57 +02:00
commit 04b0fd7e91
7 changed files with 474 additions and 450 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libavcodec/h261.c
View File

@ -28,47 +28,48 @@
#include "avcodec.h" #include "avcodec.h"
#include "h261.h" #include "h261.h"
#define IS_FIL(a) ((a)&MB_TYPE_H261_FIL) #define IS_FIL(a) ((a) & MB_TYPE_H261_FIL)
uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; uint8_t ff_h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3];
static void h261_loop_filter(uint8_t *src, int stride) static void h261_loop_filter(uint8_t *src, int stride)
{ {
int x,y,xy,yz; int x, y, xy, yz;
int temp[64]; int temp[64];
for(x=0; x<8; x++){ for (x = 0; x < 8; x++) {
temp[x ] = 4*src[x ]; temp[x] = 4 * src[x];
temp[x + 7*8] = 4*src[x + 7*stride]; temp[x + 7 * 8] = 4 * src[x + 7 * stride];
} }
for(y=1; y<7; y++){ for (y = 1; y < 7; y++) {
for(x=0; x<8; x++){ for (x = 0; x < 8; x++) {
xy = y * stride + x; xy = y * stride + x;
yz = y * 8 + x; yz = y * 8 + x;
temp[yz] = src[xy - stride] + 2*src[xy] + src[xy + stride]; temp[yz] = src[xy - stride] + 2 * src[xy] + src[xy + stride];
} }
} }
for(y=0; y<8; y++){ for (y = 0; y < 8; y++) {
src[ y*stride] = (temp[ y*8] + 2)>>2; src[y * stride] = (temp[y * 8] + 2) >> 2;
src[7+y*stride] = (temp[7+y*8] + 2)>>2; src[y * stride + 7] = (temp[y * 8 + 7] + 2) >> 2;
for(x=1; x<7; x++){ for (x = 1; x < 7; x++) {
xy = y * stride + x; xy = y * stride + x;
yz = y * 8 + x; yz = y * 8 + x;
src[xy] = (temp[yz-1] + 2*temp[yz] + temp[yz+1] + 8)>>4; src[xy] = (temp[yz - 1] + 2 * temp[yz] + temp[yz + 1] + 8) >> 4;
} }
} }
} }
void ff_h261_loop_filter(MpegEncContext *s){ void ff_h261_loop_filter(MpegEncContext *s)
H261Context * h= (H261Context*)s; {
H261Context *h = (H261Context *)s;
const int linesize = s->linesize; const int linesize = s->linesize;
const int uvlinesize= s->uvlinesize; const int uvlinesize = s->uvlinesize;
uint8_t *dest_y = s->dest[0]; uint8_t *dest_y = s->dest[0];
uint8_t *dest_cb= s->dest[1]; uint8_t *dest_cb = s->dest[1];
uint8_t *dest_cr= s->dest[2]; uint8_t *dest_cr = s->dest[2];
if(!(IS_FIL (h->mtype))) if (!(IS_FIL(h->mtype)))
return; return;
h261_loop_filter(dest_y, linesize); h261_loop_filter(dest_y, linesize);

6
libavcodec/h261.h
View File

@ -33,7 +33,7 @@
/** /**
* H261Context * H261Context
*/ */
typedef struct H261Context{ typedef struct H261Context {
MpegEncContext s; MpegEncContext s;
int current_mba; int current_mba;
@ -44,11 +44,11 @@ typedef struct H261Context{
int current_mv_y; int current_mv_y;
int gob_number; int gob_number;
int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read int gob_start_code_skipped; // 1 if gob start code is already read before gob header is read
}H261Context; } H261Context;
#define MB_TYPE_H261_FIL 0x800000 #define MB_TYPE_H261_FIL 0x800000
extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; extern uint8_t ff_h261_rl_table_store[2][2 * MAX_RUN + MAX_LEVEL + 3];
void ff_h261_loop_filter(MpegEncContext *s); void ff_h261_loop_filter(MpegEncContext *s);

41
libavcodec/h261_parser.c
View File

@ -27,38 +27,39 @@
#include "parser.h" #include "parser.h"
static int h261_find_frame_end(ParseContext *pc, AVCodecContext *avctx,
static int h261_find_frame_end(ParseContext *pc, AVCodecContext* avctx, const uint8_t *buf, int buf_size){ const uint8_t *buf, int buf_size)
{
int vop_found, i, j; int vop_found, i, j;
uint32_t state; uint32_t state;
vop_found= pc->frame_start_found; vop_found = pc->frame_start_found;
state= pc->state; state = pc->state;
for(i=0; i<buf_size && !vop_found; i++){ for (i = 0; i < buf_size && !vop_found; i++) {
state= (state<<8) | buf[i]; state = (state << 8) | buf[i];
for(j=0; j<8; j++){ for (j = 0; j < 8; j++) {
if(((state>>j)&0xFFFFF0) == 0x000100){ if (((state >> j) & 0xFFFFF0) == 0x000100) {
vop_found=1; vop_found = 1;
break; break;
} }
} }
} }
if(vop_found){ if (vop_found) {
for(; i<buf_size; i++){ for (; i < buf_size; i++) {
state= (state<<8) | buf[i]; state = (state << 8) | buf[i];
for(j=0; j<8; j++){ for (j = 0; j < 8; j++) {
if(((state>>j)&0xFFFFF0) == 0x000100){ if (((state >> j) & 0xFFFFF0) == 0x000100) {
pc->frame_start_found=0; pc->frame_start_found = 0;
pc->state= (state>>(3*8))+0xFF00; pc->state = (state >> (3 * 8)) + 0xFF00;
return i-2; return i - 2;
} }
} }
} }
} }
pc->frame_start_found= vop_found; pc->frame_start_found = vop_found;
pc->state= state; pc->state = state;
return END_NOT_FOUND; return END_NOT_FOUND;
} }
@ -73,7 +74,7 @@ static int h261_parse(AVCodecParserContext *s,
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next = buf_size; next = buf_size;
} else { } else {
next= h261_find_frame_end(pc,avctx, buf, buf_size); next = h261_find_frame_end(pc, avctx, buf, buf_size);
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL; *poutbuf = NULL;
*poutbuf_size = 0; *poutbuf_size = 0;

86
libavcodec/h261data.c
View File

@ -28,6 +28,7 @@
#include "h261.h" #include "h261.h"
#include "h261data.h" #include "h261data.h"
// H.261 VLC table for macroblock addressing // H.261 VLC table for macroblock addressing
const uint8_t ff_h261_mba_code[35] = { const uint8_t ff_h261_mba_code[35] = {
1, 3, 2, 3, 1, 3, 2, 3,
@ -39,8 +40,8 @@ const uint8_t ff_h261_mba_code[35] = {
32, 31, 30, 29, 32, 31, 30, 29,
28, 27, 26, 25, 28, 27, 26, 25,
24, 24,
15, //(MBA stuffing) 15, // (MBA stuffing)
1 //(start code) 1 // (start code)
}; };
const uint8_t ff_h261_mba_bits[35] = { const uint8_t ff_h261_mba_bits[35] = {
@ -53,11 +54,11 @@ const uint8_t ff_h261_mba_bits[35] = {
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11,
11, //(MBA stuffing) 11, // (MBA stuffing)
16 //(start code) 16 // (start code)
}; };
//H.261 VLC table for macroblock type // H.261 VLC table for macroblock type
const uint8_t ff_h261_mtype_code[10] = { const uint8_t ff_h261_mtype_code[10] = {
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
@ -70,57 +71,56 @@ const uint8_t ff_h261_mtype_bits[10] = {
2, 6 2, 6
}; };
const int ff_h261_mtype_map[10]= { const int ff_h261_mtype_map[10] = {
MB_TYPE_INTRA4x4, MB_TYPE_INTRA4x4,
MB_TYPE_INTRA4x4 | MB_TYPE_QUANT, MB_TYPE_INTRA4x4 | MB_TYPE_QUANT,
MB_TYPE_CBP, MB_TYPE_CBP,
MB_TYPE_QUANT | MB_TYPE_CBP, MB_TYPE_CBP | MB_TYPE_QUANT,
MB_TYPE_16x16, MB_TYPE_16x16,
MB_TYPE_CBP | MB_TYPE_16x16, MB_TYPE_16x16 | MB_TYPE_CBP,
MB_TYPE_QUANT | MB_TYPE_CBP | MB_TYPE_16x16, MB_TYPE_16x16 | MB_TYPE_CBP | MB_TYPE_QUANT,
MB_TYPE_16x16 | MB_TYPE_H261_FIL, MB_TYPE_16x16 | MB_TYPE_H261_FIL,
MB_TYPE_CBP | MB_TYPE_16x16 | MB_TYPE_H261_FIL, MB_TYPE_16x16 | MB_TYPE_H261_FIL | MB_TYPE_CBP,
MB_TYPE_QUANT | MB_TYPE_CBP | MB_TYPE_16x16 | MB_TYPE_H261_FIL MB_TYPE_16x16 | MB_TYPE_H261_FIL | MB_TYPE_CBP | MB_TYPE_QUANT
}; };
//H.261 VLC table for motion vectors // H.261 VLC table for motion vectors
const uint8_t ff_h261_mv_tab[17][2] = { const uint8_t ff_h261_mv_tab[17][2] = {
{1,1}, {1,2}, {1,3}, {1,4}, {3,6}, {5,7}, {4,7}, {3,7}, { 1, 1 }, { 1, 2 }, { 1, 3 }, { 1, 4 }, { 3, 6 }, { 5, 7 }, { 4, 7 }, { 3, 7 },
{11,9}, {10,9}, {9,9}, {17,10}, {16,10}, {15,10}, {14,10}, {13,10}, {12,10} { 11, 9 }, { 10, 9 }, { 9, 9 }, { 17, 10 }, { 16, 10 }, { 15, 10 }, { 14, 10 }, { 13, 10 }, { 12, 10 }
}; };
//H.261 VLC table for coded block pattern // H.261 VLC table for coded block pattern
const uint8_t ff_h261_cbp_tab[63][2] = const uint8_t ff_h261_cbp_tab[63][2] = {
{ { 11, 5 }, { 9, 5 }, { 13, 6 }, { 13, 4 }, { 23, 7 }, { 19, 7 }, { 31, 8 }, { 12, 4 },
{11,5}, {9,5}, {13,6}, {13,4}, {23,7}, {19,7}, {31,8}, {12,4}, { 22, 7 }, { 18, 7 }, { 30, 8 }, { 19, 5 }, { 27, 8 }, { 23, 8 }, { 19, 8 }, { 11, 4 },
{22,7}, {18,7}, {30,8}, {19,5}, {27,8}, {23,8}, {19,8}, {11,4}, { 21, 7 }, { 17, 7 }, { 29, 8 }, { 17, 5 }, { 25, 8 }, { 21, 8 }, { 17, 8 }, { 15, 6 },
{21,7}, {17,7}, {29,8}, {17,5}, {25,8}, {21,8}, {17,8}, {15,6}, { 15, 8 }, { 13, 8 }, { 3, 9 }, { 15, 5 }, { 11, 8 }, { 7, 8 }, { 7, 9 }, { 10, 4 },
{15,8}, {13,8}, {3,9}, {15,5}, {11,8}, {7,8}, {7,9}, {10,4}, { 20, 7 }, { 16, 7 }, { 28, 8 }, { 14, 6 }, { 14, 8 }, { 12, 8 }, { 2, 9 }, { 16, 5 },
{20,7}, {16,7}, {28,8}, {14,6}, {14,8}, {12,8}, {2,9}, {16,5}, { 24, 8 }, { 20, 8 }, { 16, 8 }, { 14, 5 }, { 10, 8 }, { 6, 8 }, { 6, 9 }, { 18, 5 },
{24,8}, {20,8}, {16,8}, {14,5}, {10,8}, {6,8}, {6,9}, {18,5}, { 26, 8 }, { 22, 8 }, { 18, 8 }, { 13, 5 }, { 9, 8 }, { 5, 8 }, { 5, 9 }, { 12, 5 },
{26,8}, {22,8}, {18,8}, {13,5}, {9,8}, {5,8}, {5,9}, {12,5}, { 8, 8 }, { 4, 8 }, { 4, 9 }, { 7, 3 }, { 10, 5 }, { 8, 5 }, { 12, 6 }
{8,8}, {4,8}, {4,9}, {7,3}, {10,5}, {8,5}, {12,6}
}; };
//H.261 VLC table for transform coefficients // H.261 VLC table for transform coefficients
static const uint16_t h261_tcoeff_vlc[65][2] = { static const uint16_t h261_tcoeff_vlc[65][2] = {
{ 0x2, 2 }, { 0x3, 2 },{ 0x4, 4 },{ 0x5, 5 }, { 0x2, 2 }, { 0x3, 2 }, { 0x4, 4 }, { 0x5, 5 },
{ 0x6, 7 },{ 0x26, 8 },{ 0x21, 8 },{ 0xa, 10 }, { 0x6, 7 }, { 0x26, 8 }, { 0x21, 8 }, { 0xa, 10 },
{ 0x1d, 12 },{ 0x18, 12 },{ 0x13, 12 },{ 0x10 , 12 }, { 0x1d, 12 }, { 0x18, 12 }, { 0x13, 12 }, { 0x10, 12 },
{ 0x1a, 13},{ 0x19, 13 }, { 0x18, 13 }, { 0x17, 13 }, { 0x1a, 13 }, { 0x19, 13 }, { 0x18, 13 }, { 0x17, 13 },
{ 0x3, 3 }, { 0x6, 6 }, { 0x25 , 8 }, { 0xc, 10 }, { 0x3, 3 }, { 0x6, 6 }, { 0x25, 8 }, { 0xc, 10 },
{ 0x1b, 12 }, { 0x16, 13 }, { 0x15, 13 }, { 0x5, 4}, { 0x1b, 12 }, { 0x16, 13 }, { 0x15, 13 }, { 0x5, 4 },
{ 0x4, 7}, { 0xb, 10 }, { 0x14, 12 }, { 0x14, 13 }, { 0x4, 7 }, { 0xb, 10 }, { 0x14, 12 }, { 0x14, 13 },
{ 0x7, 5 }, { 0x24, 8 }, { 0x1c, 12 }, { 0x13, 13 }, { 0x7, 5 }, { 0x24, 8 }, { 0x1c, 12 }, { 0x13, 13 },
{ 0x6, 5 }, { 0xf, 10 }, { 0x12, 12}, { 0x7, 6}, { 0x6, 5 }, { 0xf, 10 }, { 0x12, 12 }, { 0x7, 6 },
{ 0x9 , 10 }, { 0x12, 13 }, { 0x5, 6 }, { 0x1e, 12 }, { 0x9, 10 }, { 0x12, 13 }, { 0x5, 6 }, { 0x1e, 12 },
{ 0x4, 6 }, { 0x15, 12 }, { 0x7, 7 }, { 0x11, 12}, { 0x4, 6 }, { 0x15, 12 }, { 0x7, 7 }, { 0x11, 12 },
{ 0x5, 7 }, { 0x11, 13 }, { 0x27, 8 }, { 0x10, 13 }, { 0x5, 7 }, { 0x11, 13 }, { 0x27, 8 }, { 0x10, 13 },
{ 0x23, 8 }, { 0x22, 8 }, { 0x20, 8 }, { 0xe , 10 }, { 0x23, 8 }, { 0x22, 8 }, { 0x20, 8 }, { 0xe, 10 },
{ 0xd, 10 }, { 0x8, 10 },{ 0x1f, 12 }, { 0x1a, 12 }, { 0xd, 10 }, { 0x8, 10 }, { 0x1f, 12 }, { 0x1a, 12 },
{ 0x19, 12 }, { 0x17, 12 }, { 0x16, 12}, { 0x1f, 13}, { 0x19, 12 }, { 0x17, 12 }, { 0x16, 12 }, { 0x1f, 13 },
{ 0x1e, 13 }, { 0x1d, 13 }, { 0x1c, 13}, { 0x1b, 13}, { 0x1e, 13 }, { 0x1d, 13 }, { 0x1c, 13 }, { 0x1b, 13 },
{ 0x1, 6 } //escape { 0x1, 6 } // escape
}; };
static const int8_t h261_tcoeff_level[64] = { static const int8_t h261_tcoeff_level[64] = {

1
libavcodec/h261data.h
View File

@ -28,6 +28,7 @@
#define AVCODEC_H261DATA_H #define AVCODEC_H261DATA_H
#include <stdint.h> #include <stdint.h>
#include "h261.h" #include "h261.h"
extern const uint8_t ff_h261_mba_code[35]; extern const uint8_t ff_h261_mba_code[35];

375
libavcodec/h261dec.c
View File

@ -45,12 +45,13 @@ static VLC h261_mtype_vlc;
static VLC h261_mv_vlc; static VLC h261_mv_vlc;
static VLC h261_cbp_vlc; static VLC h261_cbp_vlc;
static int h261_decode_block(H261Context * h, int16_t * block, int n, int coded); static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded);
static av_cold void h261_decode_init_vlc(H261Context *h){ static av_cold void h261_decode_init_vlc(H261Context *h)
{
static int done = 0; static int done = 0;
if(!done){ if (!done) {
done = 1; done = 1;
INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35, INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35,
ff_h261_mba_bits, 1, 1, ff_h261_mba_bits, 1, 1,
@ -69,23 +70,21 @@ static av_cold void h261_decode_init_vlc(H261Context *h){
} }
} }
static av_cold int h261_decode_init(AVCodecContext *avctx){ static av_cold int h261_decode_init(AVCodecContext *avctx)
H261Context *h= avctx->priv_data; {
MpegEncContext * const s = &h->s; H261Context *h = avctx->priv_data;
MpegEncContext *const s = &h->s;
// set defaults // set defaults
ff_MPV_decode_defaults(s); ff_MPV_decode_defaults(s);
s->avctx = avctx; s->avctx = avctx;
s->width = s->avctx->coded_width; s->width = s->avctx->coded_width;
s->height = s->avctx->coded_height; s->height = s->avctx->coded_height;
s->codec_id = s->avctx->codec->id; s->codec_id = s->avctx->codec->id;
s->out_format = FMT_H261; s->out_format = FMT_H261;
s->low_delay= 1; s->low_delay = 1;
avctx->pix_fmt= AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
s->codec_id = avctx->codec->id;
s->codec_id= avctx->codec->id;
h261_decode_init_vlc(h); h261_decode_init_vlc(h);
@ -98,14 +97,15 @@ static av_cold int h261_decode_init(AVCodecContext *avctx){
* Decode the group of blocks header or slice header. * Decode the group of blocks header or slice header.
* @return <0 if an error occurred * @return <0 if an error occurred
*/ */
static int h261_decode_gob_header(H261Context *h){ static int h261_decode_gob_header(H261Context *h)
{
unsigned int val; unsigned int val;
MpegEncContext * const s = &h->s; MpegEncContext *const s = &h->s;
if ( !h->gob_start_code_skipped ){ if (!h->gob_start_code_skipped) {
/* Check for GOB Start Code */ /* Check for GOB Start Code */
val = show_bits(&s->gb, 15); val = show_bits(&s->gb, 15);
if(val) if (val)
return -1; return -1;
/* We have a GBSC */ /* We have a GBSC */
@ -118,29 +118,29 @@ static int h261_decode_gob_header(H261Context *h){
s->qscale = get_bits(&s->gb, 5); /* GQUANT */ s->qscale = get_bits(&s->gb, 5); /* GQUANT */
/* Check if gob_number is valid */ /* Check if gob_number is valid */
if (s->mb_height==18){ //cif if (s->mb_height == 18) { // CIF
if ((h->gob_number<=0) || (h->gob_number>12)) if ((h->gob_number <= 0) || (h->gob_number > 12))
return -1; return -1;
} } else { // QCIF
else{ //qcif if ((h->gob_number != 1) && (h->gob_number != 3) &&
if ((h->gob_number!=1) && (h->gob_number!=3) && (h->gob_number!=5)) (h->gob_number != 5))
return -1; return -1;
} }
/* GEI */ /* GEI */
while (get_bits1(&s->gb) != 0) { while (get_bits1(&s->gb) != 0)
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
}
if(s->qscale==0) { if (s->qscale == 0) {
av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n"); av_log(s->avctx, AV_LOG_ERROR, "qscale has forbidden 0 value\n");
if (s->avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_COMPLIANT)) if (s->avctx->err_recognition & (AV_EF_BITSTREAM | AV_EF_COMPLIANT))
return -1; return -1;
} }
// For the first transmitted macroblock in a GOB, MBA is the absolute address. For /* For the first transmitted macroblock in a GOB, MBA is the absolute
// subsequent macroblocks, MBA is the difference between the absolute addresses of * address. For subsequent macroblocks, MBA is the difference between
// the macroblock and the last transmitted macroblock. * the absolute addresses of the macroblock and the last transmitted
* macroblock. */
h->current_mba = 0; h->current_mba = 0;
h->mba_diff = 0; h->mba_diff = 0;
@ -151,35 +151,35 @@ static int h261_decode_gob_header(H261Context *h){
* Decode the group of blocks / video packet header. * Decode the group of blocks / video packet header.
* @return <0 if no resync found * @return <0 if no resync found
*/ */
static int ff_h261_resync(H261Context *h){ static int ff_h261_resync(H261Context *h)
MpegEncContext * const s = &h->s; {
MpegEncContext *const s = &h->s;
int left, ret; int left, ret;
if ( h->gob_start_code_skipped ){ if (h->gob_start_code_skipped) {
ret= h261_decode_gob_header(h); ret = h261_decode_gob_header(h);
if(ret>=0) if (ret >= 0)
return 0;
} else {
if (show_bits(&s->gb, 15) == 0) {
ret = h261_decode_gob_header(h);
if (ret >= 0)
return 0; return 0;
} }
else{ // OK, it is not where it is supposed to be ...
if(show_bits(&s->gb, 15)==0){ s->gb = s->last_resync_gb;
ret= h261_decode_gob_header(h);
if(ret>=0)
return 0;
}
//OK, it is not where it is supposed to be ...
s->gb= s->last_resync_gb;
align_get_bits(&s->gb); align_get_bits(&s->gb);
left= get_bits_left(&s->gb); left = get_bits_left(&s->gb);
for(;left>15+1+4+5; left-=8){ for (; left > 15 + 1 + 4 + 5; left -= 8) {
if(show_bits(&s->gb, 15)==0){ if (show_bits(&s->gb, 15) == 0) {
GetBitContext bak= s->gb; GetBitContext bak = s->gb;
ret= h261_decode_gob_header(h); ret = h261_decode_gob_header(h);
if(ret>=0) if (ret >= 0)
return 0; return 0;
s->gb= bak; s->gb = bak;
} }
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
} }
@ -192,23 +192,23 @@ static int ff_h261_resync(H261Context *h){
* Decode skipped macroblocks. * Decode skipped macroblocks.
* @return 0 * @return 0
*/ */
static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2 ) static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2)
{ {
MpegEncContext * const s = &h->s; MpegEncContext *const s = &h->s;
int i; int i;
s->mb_intra = 0; s->mb_intra = 0;
for(i=mba1; i<mba2; i++){ for (i = mba1; i < mba2; i++) {
int j, xy; int j, xy;
s->mb_x= ((h->gob_number-1) % 2) * 11 + i % 11; s->mb_x = ((h->gob_number - 1) % 2) * 11 + i % 11;
s->mb_y= ((h->gob_number-1) / 2) * 3 + i / 11; s->mb_y = ((h->gob_number - 1) / 2) * 3 + i / 11;
xy = s->mb_x + s->mb_y * s->mb_stride; xy = s->mb_x + s->mb_y * s->mb_stride;
ff_init_block_index(s); ff_init_block_index(s);
ff_update_block_index(s); ff_update_block_index(s);
for(j=0;j<6;j++) for (j = 0; j < 6; j++)
s->block_last_index[j] = -1; s->block_last_index[j] = -1;
s->mv_dir = MV_DIR_FORWARD; s->mv_dir = MV_DIR_FORWARD;
@ -225,47 +225,51 @@ static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2 )
return 0; return 0;
} }
static int decode_mv_component(GetBitContext *gb, int v){ static int decode_mv_component(GetBitContext *gb, int v)
{
static const int mvmap[17] = { static const int mvmap[17] = {
0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16 0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
}; };
int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2); int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);
/* check if mv_diff is valid */ /* check if mv_diff is valid */
if ( mv_diff < 0 ) if (mv_diff < 0)
return v; return v;
mv_diff = mvmap[mv_diff]; mv_diff = mvmap[mv_diff];
if(mv_diff && !get_bits1(gb)) if (mv_diff && !get_bits1(gb))
mv_diff= -mv_diff; mv_diff = -mv_diff;
v += mv_diff; v += mv_diff;
if (v <=-16) v+= 32; if (v <= -16)
else if(v >= 16) v-= 32; v += 32;
else if (v >= 16)
v -= 32;
return v; return v;
} }
static int h261_decode_mb(H261Context *h){ static int h261_decode_mb(H261Context *h)
MpegEncContext * const s = &h->s; {
MpegEncContext *const s = &h->s;
int i, cbp, xy; int i, cbp, xy;
cbp = 63; cbp = 63;
// Read mba // Read mba
do{ do {
h->mba_diff = get_vlc2(&s->gb, h261_mba_vlc.table, H261_MBA_VLC_BITS, 2); h->mba_diff = get_vlc2(&s->gb, h261_mba_vlc.table,
H261_MBA_VLC_BITS, 2);
/* Check for slice end */ /* Check for slice end */
/* NOTE: GOB can be empty (no MB data) or exist only of MBA_stuffing */ /* NOTE: GOB can be empty (no MB data) or exist only of MBA_stuffing */
if (h->mba_diff == MBA_STARTCODE){ // start code if (h->mba_diff == MBA_STARTCODE) { // start code
h->gob_start_code_skipped = 1; h->gob_start_code_skipped = 1;
return SLICE_END; return SLICE_END;
} }
} } while (h->mba_diff == MBA_STUFFING); // stuffing
while( h->mba_diff == MBA_STUFFING ); // stuffing
if ( h->mba_diff < 0 ){ if (h->mba_diff < 0) {
if (get_bits_left(&s->gb) <= 7) if (get_bits_left(&s->gb) <= 7)
return SLICE_END; return SLICE_END;
@ -276,11 +280,11 @@ static int h261_decode_mb(H261Context *h){
h->mba_diff += 1; h->mba_diff += 1;
h->current_mba += h->mba_diff; h->current_mba += h->mba_diff;
if ( h->current_mba > MBA_STUFFING ) if (h->current_mba > MBA_STUFFING)
return SLICE_ERROR; return SLICE_ERROR;
s->mb_x= ((h->gob_number-1) % 2) * 11 + ((h->current_mba-1) % 11); s->mb_x = ((h->gob_number - 1) % 2) * 11 + ((h->current_mba - 1) % 11);
s->mb_y= ((h->gob_number-1) / 2) * 3 + ((h->current_mba-1) / 11); s->mb_y = ((h->gob_number - 1) / 2) * 3 + ((h->current_mba - 1) / 11);
xy = s->mb_x + s->mb_y * s->mb_stride; xy = s->mb_x + s->mb_y * s->mb_stride;
ff_init_block_index(s); ff_init_block_index(s);
ff_update_block_index(s); ff_update_block_index(s);
@ -294,40 +298,39 @@ static int h261_decode_mb(H261Context *h){
h->mtype = ff_h261_mtype_map[h->mtype]; h->mtype = ff_h261_mtype_map[h->mtype];
// Read mquant // Read mquant
if ( IS_QUANT ( h->mtype ) ){ if (IS_QUANT(h->mtype))
ff_set_qscale(s, get_bits(&s->gb, 5)); ff_set_qscale(s, get_bits(&s->gb, 5));
}
s->mb_intra = IS_INTRA4x4(h->mtype); s->mb_intra = IS_INTRA4x4(h->mtype);
// Read mv // Read mv
if ( IS_16X16 ( h->mtype ) ){ if (IS_16X16(h->mtype)) {
// Motion vector data is included for all MC macroblocks. MVD is obtained from the macroblock vector by subtracting the /* Motion vector data is included for all MC macroblocks. MVD is
// vector of the preceding macroblock. For this calculation the vector of the preceding macroblock is regarded as zero in the * obtained from the macroblock vector by subtracting the vector
// following three situations: * of the preceding macroblock. For this calculation the vector
// 1) evaluating MVD for macroblocks 1, 12 and 23; * of the preceding macroblock is regarded as zero in the
// 2) evaluating MVD for macroblocks in which MBA does not represent a difference of 1; * following three situations:
// 3) MTYPE of the previous macroblock was not MC. * 1) evaluating MVD for macroblocks 1, 12 and 23;
if ( ( h->current_mba == 1 ) || ( h->current_mba == 12 ) || ( h->current_mba == 23 ) || * 2) evaluating MVD for macroblocks in which MBA does not represent a difference of 1;
( h->mba_diff != 1)) * 3) MTYPE of the previous macroblock was not MC. */
{ if ((h->current_mba == 1) || (h->current_mba == 12) ||
(h->current_mba == 23) || (h->mba_diff != 1)) {
h->current_mv_x = 0; h->current_mv_x = 0;
h->current_mv_y = 0; h->current_mv_y = 0;
} }
h->current_mv_x= decode_mv_component(&s->gb, h->current_mv_x); h->current_mv_x = decode_mv_component(&s->gb, h->current_mv_x);
h->current_mv_y= decode_mv_component(&s->gb, h->current_mv_y); h->current_mv_y = decode_mv_component(&s->gb, h->current_mv_y);
}else{ } else {
h->current_mv_x = 0; h->current_mv_x = 0;
h->current_mv_y = 0; h->current_mv_y = 0;
} }
// Read cbp // Read cbp
if ( HAS_CBP( h->mtype ) ){ if (HAS_CBP(h->mtype))
cbp = get_vlc2(&s->gb, h261_cbp_vlc.table, H261_CBP_VLC_BITS, 2) + 1; cbp = get_vlc2(&s->gb, h261_cbp_vlc.table, H261_CBP_VLC_BITS, 2) + 1;
}
if(s->mb_intra){ if (s->mb_intra) {
s->current_picture.mb_type[xy] = MB_TYPE_INTRA; s->current_picture.mb_type[xy] = MB_TYPE_INTRA;
goto intra; goto intra;
} }
@ -336,22 +339,21 @@ static int h261_decode_mb(H261Context *h){
s->mv_dir = MV_DIR_FORWARD; s->mv_dir = MV_DIR_FORWARD;
s->mv_type = MV_TYPE_16X16; s->mv_type = MV_TYPE_16X16;
s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0; s->current_picture.mb_type[xy] = MB_TYPE_16x16 | MB_TYPE_L0;
s->mv[0][0][0] = h->current_mv_x * 2;//gets divided by 2 in motion compensation s->mv[0][0][0] = h->current_mv_x * 2; // gets divided by 2 in motion compensation
s->mv[0][0][1] = h->current_mv_y * 2; s->mv[0][0][1] = h->current_mv_y * 2;
intra: intra:
/* decode each block */ /* decode each block */
if(s->mb_intra || HAS_CBP(h->mtype)){ if (s->mb_intra || HAS_CBP(h->mtype)) {
s->dsp.clear_blocks(s->block[0]); s->dsp.clear_blocks(s->block[0]);
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
if (h261_decode_block(h, s->block[i], i, cbp&32) < 0){ if (h261_decode_block(h, s->block[i], i, cbp & 32) < 0)
return SLICE_ERROR; return SLICE_ERROR;
cbp += cbp;
} }
cbp+=cbp; } else {
}
}else{
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
s->block_last_index[i]= -1; s->block_last_index[i] = -1;
} }
ff_MPV_decode_mb(s, s->block); ff_MPV_decode_mb(s, s->block);
@ -363,81 +365,87 @@ intra:
* Decode a macroblock. * Decode a macroblock.
* @return <0 if an error occurred * @return <0 if an error occurred
*/ */
static int h261_decode_block(H261Context * h, int16_t * block, static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded)
int n, int coded)
{ {
MpegEncContext * const s = &h->s; MpegEncContext *const s = &h->s;
int code, level, i, j, run; int code, level, i, j, run;
RLTable *rl = &ff_h261_rl_tcoeff; RLTable *rl = &ff_h261_rl_tcoeff;
const uint8_t *scan_table; const uint8_t *scan_table;
// For the variable length encoding there are two code tables, one being used for /* For the variable length encoding there are two code tables, one being
// the first transmitted LEVEL in INTER, INTER+MC and INTER+MC+FIL blocks, the second * used for the first transmitted LEVEL in INTER, INTER + MC and
// for all other LEVELs except the first one in INTRA blocks which is fixed length * INTER + MC + FIL blocks, the second for all other LEVELs except the
// coded with 8 bits. * first one in INTRA blocks which is fixed length coded with 8 bits.
// NOTE: the two code tables only differ in one VLC so we handle that manually. * NOTE: The two code tables only differ in one VLC so we handle that
* manually. */
scan_table = s->intra_scantable.permutated; scan_table = s->intra_scantable.permutated;
if (s->mb_intra){ if (s->mb_intra) {
/* DC coef */ /* DC coef */
level = get_bits(&s->gb, 8); level = get_bits(&s->gb, 8);
// 0 (00000000b) and -128 (10000000b) are FORBIDDEN // 0 (00000000b) and -128 (10000000b) are FORBIDDEN
if((level&0x7F) == 0){ if ((level & 0x7F) == 0) {
av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y); av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n",
level, s->mb_x, s->mb_y);
return -1; return -1;
} }
// The code 1000 0000 is not used, the reconstruction level of 1024 being coded as 1111 1111. /* The code 1000 0000 is not used, the reconstruction level of 1024
* being coded as 1111 1111. */
if (level == 255) if (level == 255)
level = 128; level = 128;
block[0] = level; block[0] = level;
i = 1; i = 1;
}else if(coded){ } else if (coded) {
// Run Level Code // Run Level Code
// EOB Not possible for first level when cbp is available (that's why the table is different) // EOB Not possible for first level when cbp is available (that's why the table is different)
// 0 1 1s // 0 1 1s
// * * 0* // * * 0*
int check = show_bits(&s->gb, 2); int check = show_bits(&s->gb, 2);
i = 0; i = 0;
if ( check & 0x2 ){ if (check & 0x2) {
skip_bits(&s->gb, 2); skip_bits(&s->gb, 2);
block[0] = ( check & 0x1 ) ? -1 : 1; block[0] = (check & 0x1) ? -1 : 1;
i = 1; i = 1;
} }
}else{ } else {
i = 0; i = 0;
} }
if(!coded){ if (!coded) {
s->block_last_index[n] = i - 1; s->block_last_index[n] = i - 1;
return 0; return 0;
} }
for(;;){ for (;;) {
code = get_vlc2(&s->gb, rl->vlc.table, TCOEFF_VLC_BITS, 2); code = get_vlc2(&s->gb, rl->vlc.table, TCOEFF_VLC_BITS, 2);
if (code < 0){ if (code < 0) {
av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n", s->mb_x, s->mb_y); av_log(s->avctx, AV_LOG_ERROR, "illegal ac vlc code at %dx%d\n",
s->mb_x, s->mb_y);
return -1; return -1;
} }
if (code == rl->n) { if (code == rl->n) {
/* escape */ /* escape */
// The remaining combinations of (run, level) are encoded with a 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits level. /* The remaining combinations of (run, level) are encoded with a
* 20-bit word consisting of 6 bits escape, 6 bits run and 8 bits
* level. */
run = get_bits(&s->gb, 6); run = get_bits(&s->gb, 6);
level = get_sbits(&s->gb, 8); level = get_sbits(&s->gb, 8);
}else if(code == 0){ } else if (code == 0) {
break; break;
}else{ } else {
run = rl->table_run[code]; run = rl->table_run[code];
level = rl->table_level[code]; level = rl->table_level[code];
if (get_bits1(&s->gb)) if (get_bits1(&s->gb))
level = -level; level = -level;
} }
i += run; i += run;
if (i >= 64){ if (i >= 64) {
av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n", s->mb_x, s->mb_y); av_log(s->avctx, AV_LOG_ERROR, "run overflow at %dx%d\n",
s->mb_x, s->mb_y);
return -1; return -1;
} }
j = scan_table[i]; j = scan_table[i];
block[j] = level; block[j] = level;
i++; i++;
} }
s->block_last_index[n] = i-1; s->block_last_index[n] = i - 1;
return 0; return 0;
} }
@ -445,33 +453,33 @@ static int h261_decode_block(H261Context * h, int16_t * block,
* Decode the H.261 picture header. * Decode the H.261 picture header.
* @return <0 if no startcode found * @return <0 if no startcode found
*/ */
static int h261_decode_picture_header(H261Context *h){ static int h261_decode_picture_header(H261Context *h)
MpegEncContext * const s = &h->s; {
MpegEncContext *const s = &h->s;
int format, i; int format, i;
uint32_t startcode= 0; uint32_t startcode = 0;
for(i= get_bits_left(&s->gb); i>24; i-=1){ for (i = get_bits_left(&s->gb); i > 24; i -= 1) {
startcode = ((startcode << 1) | get_bits(&s->gb, 1)) & 0x000FFFFF; startcode = ((startcode << 1) | get_bits(&s->gb, 1)) & 0x000FFFFF;
if(startcode == 0x10) if (startcode == 0x10)
break; break;
} }
if (startcode != 0x10){ if (startcode != 0x10) {
av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n"); av_log(s->avctx, AV_LOG_ERROR, "Bad picture start code\n");
return -1; return -1;
} }
/* temporal reference */ /* temporal reference */
i= get_bits(&s->gb, 5); /* picture timestamp */ i = get_bits(&s->gb, 5); /* picture timestamp */
if(i < (s->picture_number&31)) if (i < (s->picture_number & 31))
i += 32; i += 32;
s->picture_number = (s->picture_number&~31) + i; s->picture_number = (s->picture_number & ~31) + i;
s->avctx->time_base= (AVRational){1001, 30000}; s->avctx->time_base = (AVRational) { 1001, 30000 };
s->current_picture.f.pts = s->picture_number; s->current_picture.f.pts = s->picture_number;
/* PTYPE starts here */ /* PTYPE starts here */
skip_bits1(&s->gb); /* split screen off */ skip_bits1(&s->gb); /* split screen off */
skip_bits1(&s->gb); /* camera off */ skip_bits1(&s->gb); /* camera off */
@ -479,13 +487,13 @@ static int h261_decode_picture_header(H261Context *h){
format = get_bits1(&s->gb); format = get_bits1(&s->gb);
//only 2 formats possible // only 2 formats possible
if (format == 0){//QCIF if (format == 0) { // QCIF
s->width = 176; s->width = 176;
s->height = 144; s->height = 144;
s->mb_width = 11; s->mb_width = 11;
s->mb_height = 9; s->mb_height = 9;
}else{//CIF } else { // CIF
s->width = 352; s->width = 352;
s->height = 288; s->height = 288;
s->mb_width = 22; s->mb_width = 22;
@ -498,39 +506,42 @@ static int h261_decode_picture_header(H261Context *h){
skip_bits1(&s->gb); /* Reserved */ skip_bits1(&s->gb); /* Reserved */
/* PEI */ /* PEI */
while (get_bits1(&s->gb) != 0){ while (get_bits1(&s->gb) != 0)
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
}
// h261 has no I-FRAMES, but if we pass AV_PICTURE_TYPE_I for the first frame, the codec crashes if it does /* H.261 has no I-frames, but if we pass AV_PICTURE_TYPE_I for the first
// not contain all I-blocks (e.g. when a packet is lost) * frame, the codec crashes if it does not contain all I-blocks
* (e.g. when a packet is lost). */
s->pict_type = AV_PICTURE_TYPE_P; s->pict_type = AV_PICTURE_TYPE_P;
h->gob_number = 0; h->gob_number = 0;
return 0; return 0;
} }
static int h261_decode_gob(H261Context *h){ static int h261_decode_gob(H261Context *h)
MpegEncContext * const s = &h->s; {
MpegEncContext *const s = &h->s;
ff_set_qscale(s, s->qscale); ff_set_qscale(s, s->qscale);
/* decode mb's */ /* decode mb's */
while(h->current_mba <= MBA_STUFFING) while (h->current_mba <= MBA_STUFFING) {
{
int ret; int ret;
/* DCT & quantize */ /* DCT & quantize */
ret= h261_decode_mb(h); ret = h261_decode_mb(h);
if(ret<0){ if (ret < 0) {
if(ret==SLICE_END){ if (ret == SLICE_END) {
h261_decode_mb_skipped(h, h->current_mba, 33); h261_decode_mb_skipped(h, h->current_mba, 33);
return 0; return 0;
} }
av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n", s->mb_x + s->mb_y*s->mb_stride); av_log(s->avctx, AV_LOG_ERROR, "Error at MB: %d\n",
s->mb_x + s->mb_y * s->mb_stride);
return -1; return -1;
} }
h261_decode_mb_skipped(h, h->current_mba-h->mba_diff, h->current_mba-1); h261_decode_mb_skipped(h,
h->current_mba - h->mba_diff,
h->current_mba - 1);
} }
return -1; return -1;
@ -539,62 +550,64 @@ static int h261_decode_gob(H261Context *h){
/** /**
* returns the number of bytes consumed for building the current frame * returns the number of bytes consumed for building the current frame
*/ */
static int get_consumed_bytes(MpegEncContext *s, int buf_size){ static int get_consumed_bytes(MpegEncContext *s, int buf_size)
int pos= get_bits_count(&s->gb)>>3; {
if(pos==0) pos=1; //avoid infinite loops (i doubt that is needed but ...) int pos = get_bits_count(&s->gb) >> 3;
if(pos+10>buf_size) pos=buf_size; // oops ;) if (pos == 0)
pos = 1; // avoid infinite loops (i doubt that is needed but ...)
if (pos + 10 > buf_size)
pos = buf_size; // oops ;)
return pos; return pos;
} }
static int h261_decode_frame(AVCodecContext *avctx, static int h261_decode_frame(AVCodecContext *avctx, void *data,
void *data, int *got_frame, int *got_frame, AVPacket *avpkt)
AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
H261Context *h= avctx->priv_data; H261Context *h = avctx->priv_data;
MpegEncContext *s = &h->s; MpegEncContext *s = &h->s;
int ret; int ret;
AVFrame *pict = data; AVFrame *pict = data;
av_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size); av_dlog(avctx, "*****frame %d size=%d\n", avctx->frame_number, buf_size);
av_dlog(avctx, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]); av_dlog(avctx, "bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
s->flags= avctx->flags; s->flags = avctx->flags;
s->flags2= avctx->flags2; s->flags2 = avctx->flags2;
h->gob_start_code_skipped=0; h->gob_start_code_skipped = 0;
retry: retry:
init_get_bits(&s->gb, buf, buf_size * 8);
init_get_bits(&s->gb, buf, buf_size*8); if (!s->context_initialized)
// we need the IDCT permutaton for reading a custom matrix
if(!s->context_initialized){ if (ff_MPV_common_init(s) < 0)
if (ff_MPV_common_init(s) < 0) //we need the idct permutaton for reading a custom matrix
return -1; return -1;
}
//we need to set current_picture_ptr before reading the header, otherwise we cannot store anyting im there /* We need to set current_picture_ptr before reading the header,
* otherwise we cannot store anything in there. */
if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) { if (s->current_picture_ptr == NULL || s->current_picture_ptr->f.data[0]) {
int i= ff_find_unused_picture(s, 0); int i = ff_find_unused_picture(s, 0);
if (i < 0) if (i < 0)
return i; return i;
s->current_picture_ptr= &s->picture[i]; s->current_picture_ptr = &s->picture[i];
} }
ret = h261_decode_picture_header(h); ret = h261_decode_picture_header(h);
/* skip if the header was thrashed */ /* skip if the header was thrashed */
if (ret < 0){ if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "header damaged\n"); av_log(s->avctx, AV_LOG_ERROR, "header damaged\n");
return -1; return -1;
} }
if (s->width != avctx->coded_width || s->height != avctx->coded_height){ if (s->width != avctx->coded_width || s->height != avctx->coded_height) {
ParseContext pc= s->parse_context; //FIXME move this demuxing hack to libavformat ParseContext pc = s->parse_context; // FIXME move this demuxing hack to libavformat
s->parse_context.buffer=0; s->parse_context.buffer = 0;
ff_MPV_common_end(s); ff_MPV_common_end(s);
s->parse_context= pc; s->parse_context = pc;
} }
if (!s->context_initialized) { if (!s->context_initialized) {
avcodec_set_dimensions(avctx, s->width, s->height); avcodec_set_dimensions(avctx, s->width, s->height);
@ -606,22 +619,22 @@ retry:
s->current_picture.f.pict_type = s->pict_type; s->current_picture.f.pict_type = s->pict_type;
s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I; s->current_picture.f.key_frame = s->pict_type == AV_PICTURE_TYPE_I;
if( (avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type==AV_PICTURE_TYPE_B) if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) ||
||(avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type!=AV_PICTURE_TYPE_I) (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) ||
|| avctx->skip_frame >= AVDISCARD_ALL) avctx->skip_frame >= AVDISCARD_ALL)
return get_consumed_bytes(s, buf_size); return get_consumed_bytes(s, buf_size);
if(ff_MPV_frame_start(s, avctx) < 0) if (ff_MPV_frame_start(s, avctx) < 0)
return -1; return -1;
ff_mpeg_er_frame_start(s); ff_mpeg_er_frame_start(s);
/* decode each macroblock */ /* decode each macroblock */
s->mb_x=0; s->mb_x = 0;
s->mb_y=0; s->mb_y = 0;
while(h->gob_number < (s->mb_height==18 ? 12 : 5)){ while (h->gob_number < (s->mb_height == 18 ? 12 : 5)) {
if(ff_h261_resync(h)<0) if (ff_h261_resync(h) < 0)
break; break;
h261_decode_gob(h); h261_decode_gob(h);
} }
@ -641,7 +654,7 @@ retry:
static av_cold int h261_decode_end(AVCodecContext *avctx) static av_cold int h261_decode_end(AVCodecContext *avctx)
{ {
H261Context *h= avctx->priv_data; H261Context *h = avctx->priv_data;
MpegEncContext *s = &h->s; MpegEncContext *s = &h->s;
ff_MPV_common_end(s); ff_MPV_common_end(s);

186
libavcodec/h261enc.c
View File

@ -32,10 +32,11 @@
#include "h261.h" #include "h261.h"
#include "h261data.h" #include "h261data.h"
static void h261_encode_block(H261Context * h, int16_t * block, static void h261_encode_block(H261Context *h, int16_t *block,
int n); int n);
int ff_h261_get_picture_format(int width, int height){ int ff_h261_get_picture_format(int width, int height)
{
// QCIF // QCIF
if (width == 176 && height == 144) if (width == 176 && height == 144)
return 0; return 0;
@ -47,8 +48,9 @@ int ff_h261_get_picture_format(int width, int height){
return -1; return -1;
} }
void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number){ void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number)
H261Context * h = (H261Context *) s; {
H261Context *h = (H261Context *)s;
int format, temp_ref; int format, temp_ref;
avpriv_align_put_bits(&s->pb); avpriv_align_put_bits(&s->pb);
@ -58,8 +60,8 @@ void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number){
put_bits(&s->pb, 20, 0x10); /* PSC */ put_bits(&s->pb, 20, 0x10); /* PSC */
temp_ref= s->picture_number * (int64_t)30000 * s->avctx->time_base.num / temp_ref = s->picture_number * (int64_t)30000 * s->avctx->time_base.num /
(1001 * (int64_t)s->avctx->time_base.den); //FIXME maybe this should use a timestamp (1001 * (int64_t)s->avctx->time_base.den); // FIXME maybe this should use a timestamp
put_sbits(&s->pb, 5, temp_ref); /* TemporalReference */ put_sbits(&s->pb, 5, temp_ref); /* TemporalReference */
put_bits(&s->pb, 1, 0); /* split screen off */ put_bits(&s->pb, 1, 0); /* split screen off */
@ -74,7 +76,7 @@ void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number){
put_bits(&s->pb, 1, 0); /* reserved */ put_bits(&s->pb, 1, 0); /* reserved */
put_bits(&s->pb, 1, 0); /* no PEI */ put_bits(&s->pb, 1, 0); /* no PEI */
if(format == 0) if (format == 0)
h->gob_number = -1; h->gob_number = -1;
else else
h->gob_number = 0; h->gob_number = 0;
@ -84,12 +86,12 @@ void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number){
/** /**
* Encode a group of blocks header. * Encode a group of blocks header.
*/ */
static void h261_encode_gob_header(MpegEncContext * s, int mb_line){ static void h261_encode_gob_header(MpegEncContext *s, int mb_line)
H261Context * h = (H261Context *)s; {
if(ff_h261_get_picture_format(s->width, s->height) == 0){ H261Context *h = (H261Context *)s;
h->gob_number+=2; // QCIF if (ff_h261_get_picture_format(s->width, s->height) == 0) {
} h->gob_number += 2; // QCIF
else{ } else {
h->gob_number++; // CIF h->gob_number++; // CIF
} }
put_bits(&s->pb, 16, 1); /* GBSC */ put_bits(&s->pb, 16, 1); /* GBSC */
@ -98,64 +100,66 @@ static void h261_encode_gob_header(MpegEncContext * s, int mb_line){
put_bits(&s->pb, 1, 0); /* no GEI */ put_bits(&s->pb, 1, 0); /* no GEI */
h->current_mba = 0; h->current_mba = 0;
h->previous_mba = 0; h->previous_mba = 0;
h->current_mv_x=0; h->current_mv_x = 0;
h->current_mv_y=0; h->current_mv_y = 0;
} }
void ff_h261_reorder_mb_index(MpegEncContext* s){ void ff_h261_reorder_mb_index(MpegEncContext *s)
int index= s->mb_x + s->mb_y*s->mb_width; {
int index = s->mb_x + s->mb_y * s->mb_width;
if(index % 33 == 0) if (index % 33 == 0)
h261_encode_gob_header(s,0); h261_encode_gob_header(s, 0);
/* for CIF the GOB's are fragmented in the middle of a scanline /* for CIF the GOB's are fragmented in the middle of a scanline
that's why we need to adjust the x and y index of the macroblocks */ * that's why we need to adjust the x and y index of the macroblocks */
if(ff_h261_get_picture_format(s->width,s->height) == 1){ // CIF if (ff_h261_get_picture_format(s->width, s->height) == 1) { // CIF
s->mb_x = index % 11 ; index /= 11; s->mb_x = index % 11;
s->mb_y = index % 3 ; index /= 3; index /= 11;
s->mb_x+= 11*(index % 2); index /= 2; s->mb_y = index % 3;
s->mb_y+= 3*index; index /= 3;
s->mb_x += 11 * (index % 2);
index /= 2;
s->mb_y += 3 * index;
ff_init_block_index(s); ff_init_block_index(s);
ff_update_block_index(s); ff_update_block_index(s);
} }
} }
static void h261_encode_motion(H261Context * h, int val){ static void h261_encode_motion(H261Context *h, int val)
MpegEncContext * const s = &h->s; {
MpegEncContext *const s = &h->s;
int sign, code; int sign, code;
if(val==0){ if (val == 0) {
code = 0; code = 0;
put_bits(&s->pb,ff_h261_mv_tab[code][1],ff_h261_mv_tab[code][0]); put_bits(&s->pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]);
} } else {
else{ if (val > 15)
if(val > 15) val -= 32;
val -=32; if (val < -16)
if(val < -16) val += 32;
val+=32;
sign = val < 0; sign = val < 0;
code = sign ? -val : val; code = sign ? -val : val;
put_bits(&s->pb,ff_h261_mv_tab[code][1],ff_h261_mv_tab[code][0]); put_bits(&s->pb, ff_h261_mv_tab[code][1], ff_h261_mv_tab[code][0]);
put_bits(&s->pb,1,sign); put_bits(&s->pb, 1, sign);
} }
} }
static inline int get_cbp(MpegEncContext * s, static inline int get_cbp(MpegEncContext *s, int16_t block[6][64])
int16_t block[6][64])
{ {
int i, cbp; int i, cbp;
cbp= 0; cbp = 0;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++)
if (s->block_last_index[i] >= 0) if (s->block_last_index[i] >= 0)
cbp |= 1 << (5 - i); cbp |= 1 << (5 - i);
}
return cbp; return cbp;
} }
void ff_h261_encode_mb(MpegEncContext * s,
int16_t block[6][64], void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
int motion_x, int motion_y) int motion_x, int motion_y)
{ {
H261Context * h = (H261Context *)s; H261Context *h = (H261Context *)s;
int mvd, mv_diff_x, mv_diff_y, i, cbp; int mvd, mv_diff_x, mv_diff_y, i, cbp;
cbp = 63; // avoid warning cbp = 63; // avoid warning
mvd = 0; mvd = 0;
@ -163,77 +167,79 @@ void ff_h261_encode_mb(MpegEncContext * s,
h->current_mba++; h->current_mba++;
h->mtype = 0; h->mtype = 0;
if (!s->mb_intra){ if (!s->mb_intra) {
/* compute cbp */ /* compute cbp */
cbp= get_cbp(s, block); cbp = get_cbp(s, block);
/* mvd indicates if this block is motion compensated */ /* mvd indicates if this block is motion compensated */
mvd = motion_x | motion_y; mvd = motion_x | motion_y;
if((cbp | mvd | s->dquant ) == 0) { if ((cbp | mvd | s->dquant) == 0) {
/* skip macroblock */ /* skip macroblock */
s->skip_count++; s->skip_count++;
h->current_mv_x=0; h->current_mv_x = 0;
h->current_mv_y=0; h->current_mv_y = 0;
return; return;
} }
} }
/* MB is not skipped, encode MBA */ /* MB is not skipped, encode MBA */
put_bits(&s->pb, ff_h261_mba_bits[(h->current_mba-h->previous_mba)-1], ff_h261_mba_code[(h->current_mba-h->previous_mba)-1]); put_bits(&s->pb, ff_h261_mba_bits[(h->current_mba - h->previous_mba) - 1],
ff_h261_mba_code[(h->current_mba - h->previous_mba) - 1]);
/* calculate MTYPE */ /* calculate MTYPE */
if(!s->mb_intra){ if (!s->mb_intra) {
h->mtype++; h->mtype++;
if(mvd || s->loop_filter) if (mvd || s->loop_filter)
h->mtype+=3; h->mtype += 3;
if(s->loop_filter) if (s->loop_filter)
h->mtype+=3; h->mtype += 3;
if(cbp || s->dquant) if (cbp || s->dquant)
h->mtype++; h->mtype++;
av_assert1(h->mtype > 1); av_assert1(h->mtype > 1);
} }
if(s->dquant) if (s->dquant)
h->mtype++; h->mtype++;
put_bits(&s->pb, ff_h261_mtype_bits[h->mtype], ff_h261_mtype_code[h->mtype]); put_bits(&s->pb, ff_h261_mtype_bits[h->mtype], ff_h261_mtype_code[h->mtype]);
h->mtype = ff_h261_mtype_map[h->mtype]; h->mtype = ff_h261_mtype_map[h->mtype];
if(IS_QUANT(h->mtype)){ if (IS_QUANT(h->mtype)) {
ff_set_qscale(s,s->qscale+s->dquant); ff_set_qscale(s, s->qscale + s->dquant);
put_bits(&s->pb, 5, s->qscale); put_bits(&s->pb, 5, s->qscale);
} }
if(IS_16X16(h->mtype)){ if (IS_16X16(h->mtype)) {
mv_diff_x = (motion_x >> 1) - h->current_mv_x; mv_diff_x = (motion_x >> 1) - h->current_mv_x;
mv_diff_y = (motion_y >> 1) - h->current_mv_y; mv_diff_y = (motion_y >> 1) - h->current_mv_y;
h->current_mv_x = (motion_x >> 1); h->current_mv_x = (motion_x >> 1);
h->current_mv_y = (motion_y >> 1); h->current_mv_y = (motion_y >> 1);
h261_encode_motion(h,mv_diff_x); h261_encode_motion(h, mv_diff_x);
h261_encode_motion(h,mv_diff_y); h261_encode_motion(h, mv_diff_y);
} }
h->previous_mba = h->current_mba; h->previous_mba = h->current_mba;
if(HAS_CBP(h->mtype)){ if (HAS_CBP(h->mtype)) {
av_assert1(cbp>0); av_assert1(cbp > 0);
put_bits(&s->pb,ff_h261_cbp_tab[cbp-1][1],ff_h261_cbp_tab[cbp-1][0]); put_bits(&s->pb, ff_h261_cbp_tab[cbp - 1][1], ff_h261_cbp_tab[cbp - 1][0]);
} }
for(i=0; i<6; i++) { for (i = 0; i < 6; i++)
/* encode each block */ /* encode each block */
h261_encode_block(h, block[i], i); h261_encode_block(h, block[i], i);
}
if ( ( h->current_mba == 11 ) || ( h->current_mba == 22 ) || ( h->current_mba == 33 ) || ( !IS_16X16 ( h->mtype ) )){ if ((h->current_mba == 11) || (h->current_mba == 22) ||
h->current_mv_x=0; (h->current_mba == 33) || (!IS_16X16(h->mtype))) {
h->current_mv_y=0; h->current_mv_x = 0;
h->current_mv_y = 0;
} }
} }
void ff_h261_encode_init(MpegEncContext *s){ void ff_h261_encode_init(MpegEncContext *s)
{
static int done = 0; static int done = 0;
if (!done) { if (!done) {
@ -241,20 +247,20 @@ void ff_h261_encode_init(MpegEncContext *s){
ff_init_rl(&ff_h261_rl_tcoeff, ff_h261_rl_table_store); ff_init_rl(&ff_h261_rl_tcoeff, ff_h261_rl_table_store);
} }
s->min_qcoeff= -127; s->min_qcoeff = -127;
s->max_qcoeff= 127; s->max_qcoeff = 127;
s->y_dc_scale_table= s->y_dc_scale_table =
s->c_dc_scale_table= ff_mpeg1_dc_scale_table; s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
} }
/** /**
* Encode an 8x8 block. * Encode an 8x8 block.
* @param block the 8x8 block * @param block the 8x8 block
* @param n block index (0-3 are luma, 4-5 are chroma) * @param n block index (0-3 are luma, 4-5 are chroma)
*/ */
static void h261_encode_block(H261Context * h, int16_t * block, int n){ static void h261_encode_block(H261Context *h, int16_t *block, int n)
MpegEncContext * const s = &h->s; {
MpegEncContext *const s = &h->s;
int level, run, i, j, last_index, last_non_zero, sign, slevel, code; int level, run, i, j, last_index, last_non_zero, sign, slevel, code;
RLTable *rl; RLTable *rl;
@ -277,9 +283,10 @@ static void h261_encode_block(H261Context * h, int16_t * block, int n){
else else
put_bits(&s->pb, 8, level); put_bits(&s->pb, 8, level);
i = 1; i = 1;
} else if((block[0]==1 || block[0] == -1) && (s->block_last_index[n] > -1)){ } else if ((block[0] == 1 || block[0] == -1) &&
//special case (s->block_last_index[n] > -1)) {
put_bits(&s->pb,2,block[0]>0 ? 2 : 3 ); // special case
put_bits(&s->pb, 2, block[0] > 0 ? 2 : 3);
i = 1; i = 1;
} else { } else {
i = 0; i = 0;
@ -299,9 +306,10 @@ static void h261_encode_block(H261Context * h, int16_t * block, int n){
sign = 1; sign = 1;
level = -level; level = -level;
} }
code = get_rl_index(rl, 0 /*no last in H.261, EOB is used*/, run, level); code = get_rl_index(rl, 0 /*no last in H.261, EOB is used*/,
if(run==0 && level < 16) run, level);
code+=1; if (run == 0 && level < 16)
code += 1;
put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]); put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
if (code == rl->n) { if (code == rl->n) {
put_bits(&s->pb, 6, run); put_bits(&s->pb, 6, run);
@ -314,9 +322,8 @@ static void h261_encode_block(H261Context * h, int16_t * block, int n){
last_non_zero = i; last_non_zero = i;
} }
} }
if(last_index > -1){ if (last_index > -1)
put_bits(&s->pb, rl->table_vlc[0][1], rl->table_vlc[0][0]);// END OF BLOCK put_bits(&s->pb, rl->table_vlc[0][1], rl->table_vlc[0][0]); // EOB
}
} }
FF_MPV_GENERIC_CLASS(h261) FF_MPV_GENERIC_CLASS(h261)
@ -329,7 +336,8 @@ AVCodec ff_h261_encoder = {
.init = ff_MPV_encode_init, .init = ff_MPV_encode_init,
.encode2 = ff_MPV_encode_picture, .encode2 = ff_MPV_encode_picture,
.close = ff_MPV_encode_end, .close = ff_MPV_encode_end,
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }, .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV420P,
AV_PIX_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("H.261"), .long_name = NULL_IF_CONFIG_SMALL("H.261"),
.priv_class = &h261_class, .priv_class = &h261_class,
}; };