* 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
// avformat header files
#include <avformat.h>
+#ifdef SWSCALE
+#include <swscale.h>
+#endif
//
// This structure should be extended and made globally available in mlt
mlt_properties_set_int( properties, "gop_size", 12 );
mlt_properties_set_int( properties, "b_frames", 0 );
mlt_properties_set_int( properties, "mb_decision", FF_MB_DECISION_SIMPLE );
- mlt_properties_set_double( properties, "qscale", 0 );
+ mlt_properties_set_double( properties, "qscale", 1 );
mlt_properties_set_int( properties, "me_method", ME_EPZS );
mlt_properties_set_int( properties, "mb_cmp", FF_CMP_SAD );
mlt_properties_set_int( properties, "ildct_cmp", FF_CMP_VSAD );
c->sample_rate = mlt_properties_get_int( properties, "frequency" );
c->channels = mlt_properties_get_int( properties, "channels" );
+ if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
// Allow the user to override the audio fourcc
if ( mlt_properties_get( properties, "afourcc" ) )
{
}
// Update the output context
+
+ // Write metadata
+ char *tmp = NULL;
+ int metavalue;
+
+ tmp = mlt_properties_get( properties, "meta.attr.title.markup");
+ if (tmp != NULL) snprintf( oc->title, sizeof(oc->title), "%s", tmp );
+
+ tmp = mlt_properties_get( properties, "meta.attr.comment.markup");
+ if (tmp != NULL) snprintf( oc->comment, sizeof(oc->comment), "%s", tmp );
+
+ tmp = mlt_properties_get( properties, "meta.attr.author.markup");
+ if (tmp != NULL) snprintf( oc->author, sizeof(oc->author), "%s", tmp );
+
+ tmp = mlt_properties_get( properties, "meta.attr.copyright.markup");
+ if (tmp != NULL) snprintf( oc->copyright, sizeof(oc->copyright), "%s", tmp );
+
+ tmp = mlt_properties_get( properties, "meta.attr.album.markup");
+ if (tmp != NULL) snprintf( oc->album, sizeof(oc->album), "%s", tmp );
+
+ metavalue = mlt_properties_get_int( properties, "meta.attr.year.markup");
+ if (metavalue != 0) oc->year = metavalue;
+
+ metavalue = mlt_properties_get_int( properties, "meta.attr.track.markup");
+ if (metavalue != 0) oc->track = metavalue;
+
oc->oformat = fmt;
snprintf( oc->filename, sizeof(oc->filename), "%s", filename );
// Get audio and append to the fifo
if ( !terminated && audio_st )
{
- samples = mlt_sample_calculator( fps, frequency, count );
+ samples = mlt_sample_calculator( fps, frequency, count ++ );
mlt_frame_get_audio( frame, &pcm, &aud_fmt, &frequency, &channels, &samples );
// Create the fifo if we don't have one
pkt.size = avcodec_encode_audio( c, audio_outbuf, audio_outbuf_size, buffer );
// Write the compressed frame in the media file
- if ( c->coded_frame )
+ if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
pkt.pts = av_rescale_q( c->coded_frame->pts, c->time_base, audio_st->time_base );
pkt.flags |= PKT_FLAG_KEY;
pkt.stream_index= audio_st->index;
pkt.data= audio_outbuf;
- if ( av_interleaved_write_frame( oc, &pkt ) != 0)
- fprintf(stderr, "Error while writing audio frame\n");
+ if ( pkt.size )
+ if ( av_interleaved_write_frame( oc, &pkt ) != 0)
+ fprintf(stderr, "Error while writing audio frame\n");
audio_pts += c->frame_size;
}
}
// Do the colour space conversion
+#ifdef SWSCALE
+ struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUV422,
+ width, height, video_st->codec->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
+ sws_scale( context, input->data, input->linesize, 0, height,
+ output->data, output->linesize);
+ sws_freeContext( context );
+#else
img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+#endif
// Apply the alpha if applicable
if ( video_st->codec->pix_fmt == PIX_FMT_RGBA32 )
{
uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
+ register int n;
for ( i = 0; i < height; i ++ )
{
- p = input->data[ 0 ] + i * input->linesize[ 0 ];
+ n = ( width + 7 ) / 8;
+ p = output->data[ 0 ] + i * output->linesize[ 0 ];
+
#ifndef __DARWIN__
p += 3;
#endif
- j = width;
- while( j -- )
+
+ switch( width % 8 )
{
- *p = *alpha ++;
- *p += 4;
+ case 0: do { *p = *alpha++; p += 4;
+ case 7: *p = *alpha++; p += 4;
+ case 6: *p = *alpha++; p += 4;
+ case 5: *p = *alpha++; p += 4;
+ case 4: *p = *alpha++; p += 4;
+ case 3: *p = *alpha++; p += 4;
+ case 2: *p = *alpha++; p += 4;
+ case 1: *p = *alpha++; p += 4;
+ }
+ while( --n );
}
}
}
out_size = avcodec_encode_video(c, video_outbuf, video_outbuf_size, output );
// If zero size, it means the image was buffered
- if (out_size != 0)
+ if (out_size > 0)
{
AVPacket pkt;
av_init_packet( &pkt );
- if ( c->coded_frame )
+ if ( c->coded_frame && c->coded_frame->pts != AV_NOPTS_VALUE )
pkt.pts= av_rescale_q( c->coded_frame->pts, c->time_base, video_st->time_base );
if( c->coded_frame && c->coded_frame->key_frame )
pkt.flags |= PKT_FLAG_KEY;
ret = av_interleaved_write_frame(oc, &pkt);
video_pts += c->frame_size;
}
+ else
+ {
+ fprintf( stderr, "Error with video encode\n" );
+ }
}
frame_count++;
mlt_frame_close( frame );
projects / melted / blobdiff