X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=885e84be7117d136521276e2faba2abe0a6ba6b6;hb=bf3264b9e340ba5c11cbf59835a8af3db94e0cc2;hp=a800708a1c220135aebfc30109b7395e59577cb3;hpb=b75d860fffba41cd36fa3b3031cb0e6fedd750af;p=melted

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index a800708..885e84b 100644
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -3,19 +3,19 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 // Local header files
@@ -26,6 +26,9 @@
 
 // ffmpeg Header files
 #include <avformat.h>
+#ifdef SWSCALE
+#include <swscale.h>
+#endif
 
 // System header files
 #include <stdlib.h>
@@ -299,6 +302,22 @@ static int producer_open( mlt_producer this, char *file )
 				mlt_properties_set_int( properties, "height", codec_context->height );
 				mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
 			}
+
+			// Read Metadata
+			if (context->title != NULL) 
+				mlt_properties_set(properties, "meta.attr.title.markup", context->title );
+			if (context->author != NULL) 
+				mlt_properties_set(properties, "meta.attr.author.markup", context->author );
+			if (context->copyright != NULL) 
+				mlt_properties_set(properties, "meta.attr.copyright.markup", context->copyright );
+			if (context->comment != NULL) 
+				mlt_properties_set(properties, "meta.attr.comment.markup", context->comment );
+			if (context->album != NULL) 
+				mlt_properties_set(properties, "meta.attr.album.markup", context->album );
+			if (context->year != 0) 
+				mlt_properties_set_int(properties, "meta.attr.year.markup", context->year );
+			if (context->track != 0) 
+				mlt_properties_set_int(properties, "meta.attr.track.markup", context->track );
 			
 			// We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later)
 			if ( av == 0 && !av_bypass && audio_index != -1 && video_index != -1 )
@@ -358,6 +377,43 @@ static double producer_time_of_frame( mlt_producer this, mlt_position position )
 
 static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format format, int width, int height )
 {
+#ifdef SWSCALE
+	if ( format == mlt_image_yuv420p )
+	{
+		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+			width, height, PIX_FMT_YUV420P, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+		AVPicture output;
+		output.data[0] = buffer;
+		output.data[1] = buffer + width * height;
+		output.data[2] = buffer + ( 3 * width * height ) / 2;
+		output.linesize[0] = width;
+		output.linesize[1] = width >> 1;
+		output.linesize[2] = width >> 1;
+		sws_scale( context, frame->data, frame->linesize, 0, height,
+			output.data, output.linesize);
+		sws_freeContext( context );
+	}
+	else if ( format == mlt_image_rgb24 )
+	{
+		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+			width, height, PIX_FMT_RGB24, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+		AVPicture output;
+		avpicture_fill( &output, buffer, PIX_FMT_RGB24, width, height );
+		sws_scale( context, frame->data, frame->linesize, 0, height,
+			output.data, output.linesize);
+		sws_freeContext( context );
+	}
+	else
+	{
+		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
+			width, height, PIX_FMT_YUYV422, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+		AVPicture output;
+		avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
+		sws_scale( context, frame->data, frame->linesize, 0, height,
+			output.data, output.linesize);
+		sws_freeContext( context );
+	}
+#else
 	if ( format == mlt_image_yuv420p )
 	{
 		AVPicture pict;
@@ -381,6 +437,7 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
 		avpicture_fill( &output, buffer, PIX_FMT_YUV422, width, height );
 		img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, pix_fmt, width, height );
 	}
+#endif
 }
 
 /** Get an image from a frame.