#define FFMPEG_VERSION_INT 0x000408
#define FFMPEG_VERSION "0.4.8"
-#define LIBAVCODEC_BUILD 4684
+#define LIBAVCODEC_BUILD 4685
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION
#define CODEC_CAP_PARSE_ONLY 0x0004
#define CODEC_CAP_TRUNCATED 0x0008
+/**
+ * Pan Scan area.
+ * this specifies the area which should be displayed. Note there may be multiple such areas for one frame
+ */
+typedef struct AVPanScan{
+ /**
+ * id.
+ * - encoding: set by user.
+ * - decoding: set by lavc
+ */
+ int id;
+
+ /**
+ * width and height in 1/16 pel
+ * - encoding: set by user.
+ * - decoding: set by lavc
+ */
+ int width;
+ int height;
+
+ /**
+ * position of the top left corner in 1/16 pel for up to 3 fields/frames.
+ * - encoding: set by user.
+ * - decoding: set by lavc
+ */
+ int16_t position[3][2];
+}AVPanScan;
+
#define FF_COMMON_FRAME \
/**\
* pointer to the picture planes.\
* - decoding: set by lavc (default 0)\
*/\
int bottom_field_first;\
+ \
+ /**\
+ * Pan scan.\
+ * - encoding: set by user\
+ * - decoding: set by lavc\
+ */\
+ AVPanScan *pan_scan;\
+
#define FF_QSCALE_TYPE_MPEG1 0
#define FF_QSCALE_TYPE_MPEG2 1
* - decoding: unused
*/
int lmax;
+
} AVCodecContext;
MpegEncContext mpeg_enc_ctx;
int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
int repeat_field; /* true if we must repeat the field */
+ AVPanScan pan_scan; /** some temporary storage for the panscan */
} Mpeg1Context;
static int mpeg_decode_init(AVCodecContext *avctx)
printf("profile: %d, level: %d \n", profile, level);
}
+static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1)
+{
+ MpegEncContext *s= &s1->mpeg_enc_ctx;
+ int color_description, w, h;
+
+ skip_bits(&s->gb, 3); /* video format */
+ color_description= get_bits1(&s->gb);
+ if(color_description){
+ skip_bits(&s->gb, 8); /* color primaries */
+ skip_bits(&s->gb, 8); /* transfer_characteristics */
+ skip_bits(&s->gb, 8); /* matrix_coefficients */
+ }
+ w= get_bits(&s->gb, 14);
+ skip_bits(&s->gb, 1); //marker
+ h= get_bits(&s->gb, 14);
+ skip_bits(&s->gb, 1); //marker
+
+ s1->pan_scan.width= 16*w;
+ s1->pan_scan.height=16*h;
+
+ if(mpeg2_aspect[s->aspect_ratio_info] < 0.0)
+ s->avctx->aspect_ratio*= (s->width * h)/(float)(s->height * w);
+
+ if(s->avctx->debug & FF_DEBUG_PICT_INFO)
+ printf("sde w:%d, h:%d\n", w, h);
+}
+
+static void mpeg_decode_picture_display_extension(Mpeg1Context *s1)
+{
+ MpegEncContext *s= &s1->mpeg_enc_ctx;
+ int i;
+
+ for(i=0; i<1; i++){ //FIXME count
+ s1->pan_scan.position[i][0]= get_sbits(&s->gb, 16);
+ skip_bits(&s->gb, 1); //marker
+ s1->pan_scan.position[i][1]= get_sbits(&s->gb, 16);
+ skip_bits(&s->gb, 1); //marker
+ }
+
+ if(s->avctx->debug & FF_DEBUG_PICT_INFO)
+ printf("pde (%d,%d) (%d,%d) (%d,%d)\n",
+ s1->pan_scan.position[0][0], s1->pan_scan.position[0][1],
+ s1->pan_scan.position[1][0], s1->pan_scan.position[1][1],
+ s1->pan_scan.position[2][0], s1->pan_scan.position[2][1]
+ );
+}
+
static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
{
int i, v, j;
ext_type = get_bits(&s->gb, 4);
switch(ext_type) {
case 0x1:
- /* sequence ext */
mpeg_decode_sequence_extension(s);
break;
+ case 0x2:
+ mpeg_decode_sequence_display_extension(s1);
+ break;
case 0x3:
- /* quant matrix extension */
mpeg_decode_quant_matrix_extension(s);
break;
+ case 0x7:
+ mpeg_decode_picture_display_extension(s1);
+ break;
case 0x8:
- /* picture extension */
mpeg_decode_picture_coding_extension(s);
break;
}
s->current_picture_ptr->repeat_pict = 1;
}
}
+
+ *s->current_picture_ptr->pan_scan= s1->pan_scan;
+
//printf("%d\n", s->current_picture_ptr->repeat_pict);
if(s->avctx->debug&FF_DEBUG_PICT_INFO){