Opened 9 years ago

Closed 9 years ago

Last modified 9 years ago

#6372 closed bug (fixed)

[patch] Support H264 codec in Flash Video container in ffmpeg plugin

Reported by: Adek336 Owned by: nobody
Priority: normal Milestone: R1
Component: - General Version: R1/alpha2
Keywords: Cc:
Blocked By: Blocking:
Has a Patch: no Platform: All

Description

I propose the following patch, based on changeset hrev31605, I think it works, please review:

Index: src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp
===================================================================
--- src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	(wersja 37534)
+++ src/add-ons/media/plugins/ffmpeg/AVFormatReader.cpp	(kopia robocza)
@@ -480,7 +480,7 @@
 				break;
 		}
 		TRACE("  codecTag '%.4s' or %ld\n", (char*)&codecTag, codecTag);
-		TRACE("  fourcc '%.4s'\n", (char*)&codecContext->codec_id);
+		TRACE("  fourcc '%.4s' or %d\n", (char*)&codecContext->codec_id, codecContext->codec_id);
 
 		BMediaFormats formats;
 		status_t status = formats.GetFormatFor(description, format);
Index: src/add-ons/media/plugins/ffmpeg/CodecTable.cpp
===================================================================
--- src/add-ons/media/plugins/ffmpeg/CodecTable.cpp	(wersja 37534)
+++ src/add-ons/media/plugins/ffmpeg/CodecTable.cpp	(kopia robocza)
@@ -92,6 +92,7 @@
 	{CODEC_ID_H264,		B_MEDIA_ENCODED_VIDEO,	B_AVI_FORMAT_FAMILY,	FOURCC('h264'), "H264"},
 	{CODEC_ID_H264,		B_MEDIA_ENCODED_VIDEO,	B_AVI_FORMAT_FAMILY,	FOURCC('H264'), "H264"},
 	{CODEC_ID_H264,		B_MEDIA_ENCODED_VIDEO,	B_AVI_FORMAT_FAMILY,	FOURCC('x264'), "H264"},
+	{CODEC_ID_H264,		B_MEDIA_ENCODED_VIDEO,	B_QUICKTIME_FORMAT_FAMILY,	FOURCC('h264'), "H264"},
 	{CODEC_ID_H264,		B_MEDIA_ENCODED_VIDEO,	B_QUICKTIME_FORMAT_FAMILY,	'avc1', "AVC"},	/* MPEG-4 AVC */
 	{CODEC_ID_H264,		B_MEDIA_ENCODED_VIDEO,	B_AVI_FORMAT_FAMILY,	'VMDH', "AVC"},	/* MPEG-4 AVC */

Change History (2)

comment:1 by stippi, 9 years ago

Resolution: fixed
Status: newclosed

Except for exceeding the 80 char/line limit in the first hunk, the patch looked fine to me and I applied it in hrev37705 and hrev37706. Thanks!

comment:2 by stippi, 9 years ago

Forgot to mention, please attach patches as attachments next time, it's easier to download then. :-)

Note: See TracTickets for help on using tickets.