Switching to Av libs to handle cover pictures

transcode/AvConvTranscoder.cpp

@@ -49,7 +49,8 @@ AvConvTranscoder::AvConvTranscoder(const Parameters& parameters)
 	oss << "avconv";
 
 	// input Offset
-	oss << " -ss " << _parameters.getOffset().total_seconds();		// to be placed before '-i' to speed up seeking
+	if (_parameters.getOffset().total_seconds() > 0)
+		oss << " -ss " << _parameters.getOffset().total_seconds();		// to be placed before '-i' to speed up seeking
 
 	// Input file
 	oss << " -i \"" << _parameters.getInputMediaFile().getPath().string() << "\"";

transcode/InputMediaFile.cpp

@@ -33,28 +33,37 @@ InputMediaFile::InputMediaFile(const boost::filesystem::path& p)
 		_duration	= boost::posix_time::seconds(input.getDurationSecs() + 1);
 
 	// Get input streams
-	std::vector<Av::Stream> streams = input.getStreams();
+	std::vector<Av::Stream> avStreams = input.getStreams();
 
-	std::list<enum AVMediaType> types;
-	for (std::size_t streamId = 0; streamId < streams.size(); ++streamId)
+	std::list<enum AVMediaType> avMediaTypes;	// List of encountered streams
+	for (std::size_t avStreamId = 0; avStreamId < avStreams.size(); ++avStreamId)
 	{
-		Stream::Type type;
+		Av::Stream&	avStream(avStreams[avStreamId]);
+		Stream::Type	type;
 
-		if (getStreamType(streams[streamId].getCodecContext().getType(), type))
+		if (getStreamType(avStream.getCodecContext().getType(), type))
 		{
-			types.push_back(streams[streamId].getCodecContext().getType());
+			// Reject Video stream hat are in fact cover arts
+			if (avStream.hasAttachedPic())
+			{
+				std::cout << "Rejecting stream since it is an attached picture!" << std::endl;
+				continue;
+			}
 
-			_streams.push_back( Stream(streamId,
+
+			avMediaTypes.push_back(avStream.getCodecContext().getType());
+
+			_streams.push_back( Stream(avStreamId,
 						type,
-						streams[streamId].getMetadata().get("language"),	// TODO define somewhere else?
-						streams[streamId].getCodecContext().getCodecDesc()
+						avStream.getMetadata().get("language"),	// TODO define somewhere else?
+						avStream.getCodecContext().getCodecDesc()
 						));
 		}
 	}
 
-	types.unique();
+	avMediaTypes.unique();
 	// Scan for best streams
-	BOOST_FOREACH(enum AVMediaType type, types)
+	BOOST_FOREACH(enum AVMediaType type, avMediaTypes)
 	{
 		Av::Stream::Idx index;
 
@@ -68,6 +77,7 @@ InputMediaFile::InputMediaFile(const boost::filesystem::path& p)
 			std::cerr << "Cannot find best stream for type " << type << std::endl;
 	}
 
+	input.getPictures( _coverPictures );
 }
 
 std::vector<Stream>
@@ -82,6 +92,5 @@ InputMediaFile::getStreams(Stream::Type type) const
 	return res;
 }
 
-
 } // namespace Transcode
 

transcode/InputMediaFile.hpp

@@ -32,6 +32,9 @@ class InputMediaFile
 		boost::filesystem::path			getPath(void) const		{return _path;}
 		boost::posix_time::time_duration	getDuration(void) const		{return _duration;}
 
+		// Pictures
+		const std::vector< std::vector<unsigned char> >&	getCoverPictures(void) const { return _coverPictures; }
+
 		// Stream handling
 		std::vector<Stream>			getStreams(Stream::Type type) const;
 		const std::map<Stream::Type, Stream::Id>& getBestStreams(void) const	{return _bestStreams;}
@@ -43,6 +46,8 @@ class InputMediaFile
 
 		std::vector<Stream>			_streams;
 		std::map<Stream::Type, Stream::Id>	_bestStreams;
+
+		std::vector< std::vector<unsigned char> > _coverPictures;
 };