libavcodec.hg: vp3.c comparison

comparison vp3.c @ 1626:f74ae637ffa9 libavcodec

finally working with old theora bitstream (flipped image), the only sample I have is decoded successfully (theora.ogg)

author	alex
date	Sun, 23 Nov 2003 18:43:09 +0000
parents	932d306bf1dc
children	a80b15c0b9d5

comparison

equal deleted inserted replaced

-:c910ff78ef80
+:f74ae637ffa9
 AVFrame golden_frame;
 AVFrame last_frame;
 AVFrame current_frame;
 int keyframe;
 DSPContext dsp;
+int flipped_image;
 int quality_index;
 int last_quality_index;
 int superblock_count;
 if (plane == 0) {
 dequantizer = s->intra_y_dequant;
 output_plane = s->current_frame.data[0];
 last_plane = s->last_frame.data[0];
 golden_plane = s->golden_frame.data[0];
-stride = -s->current_frame.linesize[0];
+stride = s->current_frame.linesize[0];
+	if (!s->flipped_image) stride = -stride;
 upper_motion_limit = 7 * s->current_frame.linesize[0];
 lower_motion_limit = height * s->current_frame.linesize[0] + width - 8;
 } else if (plane == 1) {
 dequantizer = s->intra_c_dequant;
 output_plane = s->current_frame.data[1];
 last_plane = s->last_frame.data[1];
 golden_plane = s->golden_frame.data[1];
-stride = -s->current_frame.linesize[1];
+stride = s->current_frame.linesize[1];
+	if (!s->flipped_image) stride = -stride;
 upper_motion_limit = 7 * s->current_frame.linesize[1];
 lower_motion_limit = height * s->current_frame.linesize[1] + width - 8;
 } else {
 dequantizer = s->intra_c_dequant;
 output_plane = s->current_frame.data[2];
 last_plane = s->last_frame.data[2];
 golden_plane = s->golden_frame.data[2];
-stride = -s->current_frame.linesize[2];
+stride = s->current_frame.linesize[2];
+	if (!s->flipped_image) stride = -stride;
 upper_motion_limit = 7 * s->current_frame.linesize[2];
 lower_motion_limit = height * s->current_frame.linesize[2] + width - 8;
 }
 /* for each fragment row... */
 motion_source += ((motion_y >> 1) * stride);
 if(src_x<0 || src_y<0 || src_x + 9 >= width || src_y + 9 >= height){
 uint8_t *temp= s->edge_emu_buffer;
 if(stride<0) temp -= 9*stride;
+			else temp += 9*stride;
 ff_emulated_edge_mc(temp, motion_source, stride, 9, 9, src_x, src_y, width, height);
 motion_source= temp;
 }
 }
 }
 /* V plane */
 i = s->v_fragment_start;
 for (y = s->fragment_height / 2; y > 0; y--) {
+for (x = 0; x < s->fragment_width / 2; x++) {
+s->all_fragments[i++].first_pixel =
+s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
+s->golden_frame.linesize[2] +
+x * FRAGMENT_PIXELS;
+debug_init("  fragment %d, first pixel @ %d\n",
+i-1, s->all_fragments[i-1].first_pixel);
+}
+}
+}
+/* FIXME: this should be merged with the above! */
+static void theora_calculate_pixel_addresses(Vp3DecodeContext *s)
+{
+int i, x, y;
+/* figure out the first pixel addresses for each of the fragments */
+/* Y plane */
+i = 0;
+for (y = 1; y <= s->fragment_height; y++) {
+for (x = 0; x < s->fragment_width; x++) {
+s->all_fragments[i++].first_pixel =
+s->golden_frame.linesize[0] * y * FRAGMENT_PIXELS -
+s->golden_frame.linesize[0] +
+x * FRAGMENT_PIXELS;
+debug_init("  fragment %d, first pixel @ %d\n",
+i-1, s->all_fragments[i-1].first_pixel);
+}
+}
+/* U plane */
+i = s->u_fragment_start;
+for (y = 1; y <= s->fragment_height / 2; y++) {
+for (x = 0; x < s->fragment_width / 2; x++) {
+s->all_fragments[i++].first_pixel =
+s->golden_frame.linesize[1] * y * FRAGMENT_PIXELS -
+s->golden_frame.linesize[1] +
+x * FRAGMENT_PIXELS;
+debug_init("  fragment %d, first pixel @ %d\n",
+i-1, s->all_fragments[i-1].first_pixel);
+}
+}
+/* V plane */
+i = s->v_fragment_start;
+for (y = 1; y <= s->fragment_height / 2; y++) {
 for (x = 0; x < s->fragment_width / 2; x++) {
 s->all_fragments[i++].first_pixel =
 s->golden_frame.linesize[2] * y * FRAGMENT_PIXELS -
 s->golden_frame.linesize[2] +
 x * FRAGMENT_PIXELS;
 	av_log(s->avctx, AV_LOG_ERROR, "Theora: bad frame indicator\n");
 	return -1;
 }
 s->keyframe = !get_bits1(&gb);
-if (s->theora && s->keyframe)
+if (s->theora)
 {
-	if (get_bits1(&gb))
+	s->last_quality_index = s->quality_index;
-	    av_log(s->avctx, AV_LOG_ERROR, "Theora: warning, unsupported keyframe coding type?!\n");
+	s->quality_index = get_bits(&gb, 6);
-	skip_bits(&gb, 2); /* reserved? */
+	if ( s->keyframe)
+	{
+	    if (get_bits1(&gb))
+		av_log(s->avctx, AV_LOG_ERROR, "Theora: warning, unsupported keyframe coding type?!\n");
+	    skip_bits(&gb, 2); /* reserved? */
+	}
 }
 else
+{
 	skip_bits(&gb, 1);
-s->last_quality_index = s->quality_index;
+	s->last_quality_index = s->quality_index;
-s->quality_index = get_bits(&gb, 6);
+	s->quality_index = get_bits(&gb, 6);
+}
 debug_vp3(" VP3 %sframe #%d: Q index = %d\n",
 	s->keyframe?"key":"", counter, s->quality_index);
 counter++;
 /* golden frame is also the current frame */
 memcpy(&s->current_frame, &s->golden_frame, sizeof(AVFrame));
 /* time to figure out pixel addresses? */
 if (!s->pixel_addresses_inited)
-vp3_calculate_pixel_addresses(s);
+	{
+	    if (!s->flipped_image)
+	vp3_calculate_pixel_addresses(s);
+	    else
+		theora_calculate_pixel_addresses(s);
+	}
 } else {
 /* allocate a new current frame */
 s->current_frame.reference = 3;
 if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
 av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
 * to the same frame as either the golden or last frame */
 return 0;
 }
-/* current version is 3.2.0 */
 static int theora_decode_header(AVCodecContext *avctx, GetBitContext gb)
 {
 Vp3DecodeContext *s = avctx->priv_data;
+int major, minor, micro;
-skip_bits(&gb, 8); /* version major */
-skip_bits(&gb, 8); /* version minor */
+major = get_bits(&gb, 8); /* version major */
-skip_bits(&gb, 8); /* version micro */
+minor = get_bits(&gb, 8); /* version minor */
+micro = get_bits(&gb, 8); /* version micro */
+av_log(avctx, AV_LOG_INFO, "Theora bitstream version %d.%d.%d\n",
+	major, minor, micro);
+/* 3.3.0 aka alpha3 has the same frame orientation as original vp3 */
+/* but previous versions have the image flipped relative to vp3 */
+if ((major <= 3) && (minor < 3))
+{
+	s->flipped_image = 1;
+av_log(avctx, AV_LOG_DEBUG, "Old (<alpha3) Theora bitstream, flipped image\n");
+}
 s->width = get_bits(&gb, 16) << 4;
 s->height = get_bits(&gb, 16) << 4;
 skip_bits(&gb, 24); /* frame width */
 skip_bits(&gb, 24); /* frame height */

Mercurial > libavcodec.hg

comparison vp3.c @ 1626:f74ae637ffa9 libavcodec