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

added aspected_width/height for EXTENDED_PAR

Browse Source 
Originally committed as revision 869 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2002-08-26 20:45:01 +00:00
parent 1ffd8306ba
commit e769f0535e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/avcodec.h
View File

@ -152,6 +152,7 @@ typedef struct AVCodecContext {
#define FF_ASPECT_4_3_525 3 #define FF_ASPECT_4_3_525 3
#define FF_ASPECT_16_9_625 4 #define FF_ASPECT_16_9_625 4
#define FF_ASPECT_16_9_525 5 #define FF_ASPECT_16_9_525 5
#define FF_ASPECT_EXTENDED 15
int gop_size; /* 0 = intra only */ int gop_size; /* 0 = intra only */
enum PixelFormat pix_fmt; /* pixel format, see PIX_FMT_xxx */ enum PixelFormat pix_fmt; /* pixel format, see PIX_FMT_xxx */
int repeat_pict; /* when decoding, this signal how much the picture */ int repeat_pict; /* when decoding, this signal how much the picture */
@ -304,6 +305,9 @@ typedef struct AVCodecContext {
float i_quant_offset;/* qscale offset between i and p frames */ float i_quant_offset;/* qscale offset between i and p frames */
float rc_initial_cplx; float rc_initial_cplx;
int aspected_width;
int aspected_height;
//FIXME this should be reordered after kabis API is finished ... //FIXME this should be reordered after kabis API is finished ...
//TODO kill kabi //TODO kill kabi
/* /*
@ -334,7 +338,7 @@ typedef struct AVCodecContext {
uc_res6,uc_res7,uc_res8,uc_res9,uc_res10,uc_res11,uc_res12; uc_res6,uc_res7,uc_res8,uc_res9,uc_res10,uc_res11,uc_res12;
unsigned int unsigned int
ui_res0,ui_res1,ui_res2,ui_res3,ui_res4,ui_res5,ui_res6,ui_res7,ui_res8,ui_res9, ui_res0,ui_res1,ui_res2,ui_res3,ui_res4,ui_res5,ui_res6,ui_res7,ui_res8,ui_res9,
ui_res10,ui_res11,ui_res12,ui_res13,ui_res14,ui_res15,ui_res16,ui_res17,ui_res18,ui_res19; ui_res10,ui_res11,ui_res12,ui_res13,ui_res14,ui_res15,ui_res16,ui_res17;
} AVCodecContext; } AVCodecContext;
typedef struct AVCodec { typedef struct AVCodec {

5
libavcodec/mpegvideo.c
View File

@ -382,6 +382,11 @@ int MPV_encode_init(AVCodecContext *avctx)
s->qblur= avctx->qblur; s->qblur= avctx->qblur;
s->avctx = avctx; s->avctx = avctx;
s->aspect_ratio_info= avctx->aspect_ratio_info; s->aspect_ratio_info= avctx->aspect_ratio_info;
if (avctx->aspect_ratio_info == FF_ASPECT_EXTENDED)
{
s->aspected_width = avctx->aspected_width;
s->aspected_height = avctx->aspected_height;
}
s->flags= avctx->flags; s->flags= avctx->flags;
s->max_b_frames= avctx->max_b_frames; s->max_b_frames= avctx->max_b_frames;
s->b_frame_strategy= avctx->b_frame_strategy; s->b_frame_strategy= avctx->b_frame_strategy;

3
libavcodec/mpegvideo.h
View File

@ -360,6 +360,8 @@ typedef struct MpegEncContext {
int new_pred; int new_pred;
int reduced_res_vop; int reduced_res_vop;
int aspect_ratio_info; int aspect_ratio_info;
int aspected_width;
int aspected_height;
int sprite_warping_accuracy; int sprite_warping_accuracy;
int low_latency_sprite; int low_latency_sprite;
int data_partitioning; int data_partitioning;
@ -415,7 +417,6 @@ typedef struct MpegEncContext {
/* [mb_intra][isChroma][level][run][last] */ /* [mb_intra][isChroma][level][run][last] */
int ac_stats[2][2][MAX_LEVEL+1][MAX_RUN+1][2]; int ac_stats[2][2][MAX_LEVEL+1][MAX_RUN+1][2];
int inter_intra_pred; int inter_intra_pred;
/* decompression specific */ /* decompression specific */
GetBitContext gb; GetBitContext gb;