clean In/Out File

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 2adf85cf3b92 · 2014-02-17T04:55:30.000-05:00
diff --git a/src/AvTranscoder/ColorTransform.cpp b/src/AvTranscoder/ColorTransform.cpp
@@ -28,6 +28,7 @@ ColorTransform::ColorTransform()
 	, dstLineSize ( MAX_SWS_PLANE, 0 )
 	, srcOffsets  ( MAX_SWS_PLANE, 0 )
 	, dstOffsets  ( MAX_SWS_PLANE, 0 )
+	, m_isInit    ( false )
 {
 }
 
@@ -43,6 +44,11 @@ bool ColorTransform::init( const Image& src, const Image& dst )
 		dst.desc().getWidth(), dst.desc().getHeight(), dst.desc().getPixelDesc().findPixel(),
 		SWS_POINT, NULL, NULL, NULL);
 
+	if( !m_imageConvertContext )
+	{
+		throw std::runtime_error( "unable to create color convert context" );
+	}
+
 	av_image_fill_linesizes( &srcLineSize[0], src.desc().getPixelDesc().findPixel(), src.desc().getWidth() );
 	av_image_fill_linesizes( &dstLineSize[0], dst.desc().getPixelDesc().findPixel(), dst.desc().getWidth() );
 
@@ -84,7 +90,7 @@ void ColorTransform::convert( const Image& src, Image& dst )
 	
 	if( !m_imageConvertContext )
 	{
-		throw std::runtime_error( "unknown convert context" );
+		throw std::runtime_error( "unknown color convert context" );
 	}
 
 	int ret = sws_scale( m_imageConvertContext,
diff --git a/src/AvTranscoder/InputFile.cpp b/src/AvTranscoder/InputFile.cpp
@@ -130,18 +130,10 @@ InputFile& InputFile::analyse()
 VideoDesc InputFile::getVideoDesc( size_t videoStreamId )
 {
 	int selectedStream = -1;
-	size_t videoStreamCount = 0;
 
-	for( size_t streamId = 0; streamId < m_formatContext->nb_streams; streamId++ )
+	if( m_formatContext->streams[videoStreamId]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 	{
-		if( m_formatContext->streams[streamId]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
-		{
-			if( videoStreamCount == videoStreamId )
-			{
-				selectedStream = streamId;
-			}
-			videoStreamCount++;
-		}
+		selectedStream = videoStreamId;
 	}
 
 	if( selectedStream == -1 )
@@ -162,18 +154,10 @@ VideoDesc InputFile::getVideoDesc( size_t videoStreamId )
 AudioDesc InputFile::getAudioDesc( size_t audioStreamId )
 {
 	int selectedStream = -1;
-	size_t audioStreamCount = 0;
-
-	for( size_t streamId = 0; streamId < m_formatContext->nb_streams; streamId++ )
+	
+	if( m_formatContext->streams[audioStreamId]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
 	{
-		if( m_formatContext->streams[streamId]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-		{
-			if( audioStreamCount == audioStreamId )
-			{
-				selectedStream = streamId;
-			}
-			audioStreamCount++;
-		}
+		selectedStream = audioStreamId;
 	}
 
 	if( selectedStream == -1 )
diff --git a/src/AvTranscoder/OutputFile.cpp b/src/AvTranscoder/OutputFile.cpp
@@ -118,7 +118,7 @@ bool OutputFile::wrap( const DataStream& data, const size_t streamId )
 	packet.dts = 0;
 	packet.pts = packetCount;
 
-	if( av_interleaved_write_frame( formatContext, &packet ) != 0 )
+	if( 	( formatContext, &packet ) != 0 )
 	{
 		std::cout << "error when writting packet in stream" << std::endl;
 		return false;
diff --git a/src/SConscript b/src/SConscript
@@ -33,27 +33,26 @@ jAvTranscoder = envJava.SharedLibrary(
         'jAvTranscoder',
         source=['AvTranscoder/avTranscoder.i'],
         LIBS=[ 
-            AvTranscoder
+            sAvTranscoder
         ],
     )
 
 pyAvTranscoder = envPy.SharedLibrary(
         'pyAvTranscoder',
         source='AvTranscoder/avTranscoder.i',
-        LIBS=[ AvTranscoder ],
+        LIBS=[ sAvTranscoder ],
     )
 
-# envJava['JARCHDIR']=env.Dir('#build/src/').get_abspath()
+#envJava['JARCHDIR']=env.Dir('#build/src/').get_abspath()
 
-# avTranscoder_class = env.Java(
-#      target='AvTranscoderClass',
-#      #source='AvTranscoder/avTranscoder.i' )
-#      source= Glob( '#build/src/AvTranscoder' ) )
+avTranscoder_class = env.Java(
+      target='AvTranscoderClass',
+      source= Glob( '#build/src/AvTranscoder/src/AvTranscoder' ) )
 
-# avTranscoder_jar = env.Jar(
-#      target='jAvTranscoder.jar',
-#      source=avTranscoder_class )
-#      #source= Glob( '#build/src/AvTranscoderClass' ) )
+avTranscoder_jar = env.Jar(
+    target='jAvTranscoder.jar',
+    source=avTranscoder_class )
+    #source= Glob( '#build/src/AvTranscoderClass' ) )
 
 
 # env.Depends( avTranscoder_class, jAvTranscoder )

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ ColorTransform::ColorTransform()`
`28`	`28`	`, dstLineSize ( MAX_SWS_PLANE, 0 )`
`29`	`29`	`, srcOffsets ( MAX_SWS_PLANE, 0 )`
`30`	`30`	`, dstOffsets ( MAX_SWS_PLANE, 0 )`
	`31`	`+ , m_isInit ( false )`
`31`	`32`	`{`
`32`	`33`	`}`
`33`	`34`
`@@ -43,6 +44,11 @@ bool ColorTransform::init( const Image& src, const Image& dst )`
`43`	`44`	`dst.desc().getWidth(), dst.desc().getHeight(), dst.desc().getPixelDesc().findPixel(),`
`44`	`45`	`SWS_POINT, NULL, NULL, NULL);`
`45`	`46`
	`47`	`+ if( !m_imageConvertContext )`
	`48`	`+ {`
	`49`	`+ throw std::runtime_error( "unable to create color convert context" );`
	`50`	`+ }`
	`51`	`+`
`46`	`52`	`av_image_fill_linesizes( &srcLineSize[0], src.desc().getPixelDesc().findPixel(), src.desc().getWidth() );`
`47`	`53`	`av_image_fill_linesizes( &dstLineSize[0], dst.desc().getPixelDesc().findPixel(), dst.desc().getWidth() );`
`48`	`54`
`@@ -84,7 +90,7 @@ void ColorTransform::convert( const Image& src, Image& dst )`
`84`	`90`
`85`	`91`	`if( !m_imageConvertContext )`
`86`	`92`	`{`
`87`		`- throw std::runtime_error( "unknown convert context" );`
	`93`	`+ throw std::runtime_error( "unknown color convert context" );`
`88`	`94`	`}`
`89`	`95`
`90`	`96`	`int ret = sws_scale( m_imageConvertContext,`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ bool OutputFile::wrap( const DataStream& data, const size_t streamId )`
`118`	`118`	`packet.dts = 0;`
`119`	`119`	`packet.pts = packetCount;`
`120`	`120`
`121`		`- if( av_interleaved_write_frame( formatContext, &packet ) != 0 )`
	`121`	`+ if( ( formatContext, &packet ) != 0 )`
`122`	`122`	`{`
`123`	`123`	`std::cout << "error when writting packet in stream" << std::endl;`
`124`	`124`	`return false;`