[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] avi/fileformat aviffpln.cpp, 1.6.2.6.4.6, 1.6.2.6.4.6.4.1 avistrm.cpp, 1.10.2.13.2.29
From: shuohuang () helixcommunity ! org
Date: 2012-03-29 9:49:02
[Download RAW message or body]
Update of /cvsroot/datatype/avi/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16602/datatype/avi/fileformat
Modified Files:
Tag: hxclient_3_6_1_raja
aviffpln.cpp avistrm.cpp
Log Message:
Synopsis: checkin local patch files for 361 raja branch.
Bug 14812: Checkin local patch files to 361_raja branch
File added:
common/fileio/fdbufdataf.cpp
common/fileio/fdbufdataf.h
common/include/platform.h
datatype/ape/renderer/aperend.cpp
datatype/avi/fileformat/aviffpln.cpp
datatype/avi/fileformat/avistrm.cpp
datatype/avi/fileformat/pub/aviffpln.h
datatype/flac/renderer/flacrend.cpp
datatype/flash/flv/fileformat/flv_file_format.cpp
datatype/h261/renderer/config.h
datatype/mkv/fileformat/mkv_file_format.cpp
datatype/mkv/libmatroska/Matroska.cpp
datatype/mkv/libmatroska/libebml/src/EbmlUnicodeString.cpp
datatype/mp4/fileformat/qtatmmgs.cpp
datatype/mp4/fileformat/qttrack.cpp
datatype/mp4/fileformat/pub/qtatoms.h
datatype/mp4/video/renderer/mp4vdfmt.cpp
datatype/mpg/common/xmdplugincommon.h
datatype/mpg/fileformat/Umakefil
datatype/mpg/fileformat/rmpgff.cpp
datatype/mpg/fileformat/rmpgff.h
datatype/mpg/fileformat/xmddemuxer.cpp
datatype/mpg/fileformat/xmddemuxer.h
datatype/mpg/renderer/mpgvideo.cpp
datatype/mpg/renderer/mpgvideo.h
datatype/mpg/renderer/mpgvidfmt.cpp
datatype/null/renderer/nullrend.cpp
datatype/omx/common/android/4.0/CBaseOmxDec_TI_4.0.cpp
datatype/omx/video/decoder/COmxVideoDec.cpp
datatype/omx/video/decoder/COmxVideoDec.h
filesystem/local/full/smplfsys.cpp
player/kit/android/hxplatformobj.cpp
player/kit/android/hxplatformobj.h
player/kit/android/4.0/MetaDataDriver.cpp
player/kit/android/4.0/PlayerDriver.cpp
player/kit/android/4.0/mediascanner.cpp
video/sitelib/platform/unix/android/4.0/miniandroidsurf_4.cpp
Index: aviffpln.cpp
===================================================================
RCS file: /cvsroot/datatype/avi/fileformat/aviffpln.cpp,v
retrieving revision 1.6.2.6.4.6
retrieving revision 1.6.2.6.4.6.4.1
diff -u -d -r1.6.2.6.4.6 -r1.6.2.6.4.6.4.1
--- aviffpln.cpp 13 Feb 2012 05:41:21 -0000 1.6.2.6.4.6
+++ aviffpln.cpp 29 Mar 2012 09:48:59 -0000 1.6.2.6.4.6.4.1
@@ -677,6 +677,8 @@
if (!pStream->HasPackets() && pStream->AtEndOfStream())
{
m_pFFResponse->StreamDone(unStreamNumber);
+ TerminateAllStreams();
+ return HXR_OK;
}
ScanState();
@@ -684,6 +686,18 @@
return HXR_OK;
}
+void CAVIFileFormat::TerminateAllStreams()
+{
+ for (UINT16 i = 0; i < m_streamArray.GetSize(); ++i)
+ {
+ CAVIStream* pStream = (CAVIStream*) m_streamArray[i];
+ if(pStream)
+ {
+ pStream->ClearPendingPacketCount();
+ m_pFFResponse->StreamDone(i);
+ }
+ }
+}
/************************************************************************
* Seek
@@ -1662,7 +1676,9 @@
{
pStream->ClearPendingPacketCount();
m_pFFResponse->StreamDone(i);
- continue;
+ //continue;
+ TerminateAllStreams();
+ return ;
}
if (pStream->HasPackets() &&
Index: avistrm.cpp
===================================================================
RCS file: /cvsroot/datatype/avi/fileformat/avistrm.cpp,v
retrieving revision 1.10.2.13.2.29
retrieving revision 1.10.2.13.2.29.4.1
diff -u -d -r1.10.2.13.2.29 -r1.10.2.13.2.29.4.1
--- avistrm.cpp 13 Feb 2012 05:41:22 -0000 1.10.2.13.2.29
+++ avistrm.cpp 29 Mar 2012 09:49:00 -0000 1.10.2.13.2.29.4.1
@@ -294,6 +294,16 @@
#define BI_RGB 0
#endif
+typedef struct _mp3_audio_header
+{
+ UINT32 nFlags;
+ UINT16 nID;
+ UINT16 nBlockSize;
+ UINT16 nFramesPerBlock;
+ UINT16 nCodecDelay;
+} MP3_AUDIO_HEADER;
+
+
/////////////////////////////////////////////////////////////////////////
// CAVIStream::CAVIStream
//
@@ -1034,6 +1044,10 @@
case WAVE_FORMAT_AC3:
{
pMimeType = "audio/AC3";
+#ifdef DOLBY_DDPDEC51_TEGRA_MULTICHANNEL
+ pWaveInfo->usBitsPerSample = 16;
+ pWaveInfo->usChannels = 2;
+#endif
}
break;
default:
@@ -1121,7 +1135,32 @@
pHeader->SetPropertyULONG32("Channels", pWaveInfo->usChannels);
//HX_TRACE("\t\tChannels:\t%lu\n", pWaveInfo->usChannels);
+ pHeader->SetPropertyULONG32("BlockAlign", pWaveInfo->usBlockAlign);
+
+ if(pWaveInfo->usFormatTag == WAVE_FORMAT_MPEGLAYER3 && \
pWaveInfo->usSize >= sizeof(MP3_AUDIO_HEADER)) + {
+ MP3_AUDIO_HEADER* pMP3_hdr = (MP3_AUDIO_HEADER*)(pWaveInfo + 1);
+ pMP3_hdr->nID = HOST_TO_LE16(pMP3_hdr->nID);
+ pMP3_hdr->nFlags = HOST_TO_LE32(pMP3_hdr->nFlags);
+ pMP3_hdr->nBlockSize = HOST_TO_LE16(pMP3_hdr->nBlockSize);
+ pMP3_hdr->nFramesPerBlock = \
HOST_TO_LE16(pMP3_hdr->nFramesPerBlock); + pMP3_hdr->nCodecDelay = \
HOST_TO_LE16(pMP3_hdr->nCodecDelay); +
+ pHeader->SetPropertyULONG32("MP3_ID", pMP3_hdr->nID);
+ pHeader->SetPropertyULONG32("MP3_Flags", pMP3_hdr->nFlags);
+ pHeader->SetPropertyULONG32("BlockSize", pMP3_hdr->nBlockSize);
+ pHeader->SetPropertyULONG32("MP3_FramesPerBlock", \
pMP3_hdr->nFramesPerBlock); + \
pHeader->SetPropertyULONG32("MP3_CodecDelay", pMP3_hdr->nCodecDelay); + \
} +
+ if(m_header.ulSampleSize)
+ {
m_fChunksPerSecond = m_pIndex->GetChunkTotal(m_usStream) / ((double) \
m_pIndex->GetByteTotal(m_usStream) / pWaveInfo->ulAvgBytesPerSec); + }
+ else
+ {
+ m_fChunksPerSecond = (double) m_header.ulRate / \
m_header.ulScale; + }
m_fSamplesPerSecond = (double) m_header.ulRate / m_header.ulScale;
break;
}
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic