Add AC3 Atom support to MP4Info and MP4Dump #122
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| /***************************************************************** | ||
| | | ||
| | AP4 - dac3 Atoms | ||
| | | ||
| | Copyright 2002-2008 Axiomatic Systems, LLC | ||
| | | ||
| | | ||
| | This file is part of Bento4/AP4 (MP4 Atom Processing Library). | ||
| | | ||
| | Unless you have obtained Bento4 under a difference license, | ||
| | this version of Bento4 is Bento4|GPL. | ||
| | Bento4|GPL 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, or (at your option) | ||
| | any later version. | ||
| | | ||
| | Bento4|GPL 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. | ||
| | | ||
| | You should have received a copy of the GNU General Public License | ||
| | along with Bento4|GPL; see the file COPYING. If not, write to the | ||
| | Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA | ||
| | 02111-1307, USA. | ||
| | | ||
| ****************************************************************/ | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | includes | ||
| +---------------------------------------------------------------------*/ | ||
| #include "Ap4Dac3Atom.h" | ||
| #include "Ap4AtomFactory.h" | ||
| #include "Ap4Utils.h" | ||
| #include "Ap4Types.h" | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | dynamic cast support | ||
| +---------------------------------------------------------------------*/ | ||
| AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_Dac3Atom) | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | AP4_Dac3Atom::Create | ||
| +---------------------------------------------------------------------*/ | ||
| AP4_Dac3Atom* | ||
| AP4_Dac3Atom::Create(AP4_Size size, AP4_ByteStream& stream) | ||
| { | ||
| // read the raw bytes in a buffer | ||
| unsigned int payload_size = size-AP4_ATOM_HEADER_SIZE; | ||
| AP4_DataBuffer payload_data(payload_size); | ||
| AP4_Result result = stream.Read(payload_data.UseData(), payload_size); | ||
| if (AP4_FAILED(result)) return NULL; | ||
|
|
||
| // check the version | ||
| const AP4_UI08* payload = payload_data.GetData(); | ||
| return new AP4_Dac3Atom(size, payload); | ||
| } | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | AP4_Dac3Atom::AP4_Dac3Atom | ||
| +---------------------------------------------------------------------*/ | ||
| AP4_Dac3Atom::AP4_Dac3Atom(AP4_UI32 size, const AP4_UI08* payload) : | ||
| AP4_Atom(AP4_ATOM_TYPE_DAC3, size), | ||
| m_Fscod(0), | ||
| m_Bsid(0), | ||
| m_Bsmod(0), | ||
| m_Acmod(0), | ||
| m_Lfeon(0), | ||
| m_BitRateCode(0), | ||
| m_Reserved(0) | ||
| { | ||
| // make a copy of our configuration bytes | ||
| unsigned int payload_size = size-AP4_ATOM_HEADER_SIZE; | ||
| m_RawBytes.SetData(payload, payload_size); | ||
|
|
||
| // sanity check | ||
| if (payload_size < 2) return; | ||
|
There was a problem hiding this comment. Wouldn't we want a payload of at least 3 bytes (as we read There was a problem hiding this comment. You're right, this should be < 3 |
||
|
|
||
| // parse the payload | ||
| m_Fscod = (payload[0]>>6) & 0x3; | ||
| m_Bsid = (payload[0]>>1) & 0x1F; | ||
| m_Bsmod = (payload[0]<<2 | payload[1]>>6) & 0x3; | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. Good catch. This should be masked with 0x7, not 0x3, as the field is 3 bits wide. Thanks for spotting that. |
||
| m_Acmod = (payload[1]>>3) & 0x7; | ||
| m_Lfeon = (payload[1]>>2) & 0x1; | ||
| m_BitRateCode = (payload[1]<<3 | payload[2]>>5) & 0x1F; | ||
| m_Reserved = payload[2] & 0x1F; | ||
|
|
||
| } | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | AP4_Dac3Atom::WriteFields | ||
| +---------------------------------------------------------------------*/ | ||
| AP4_Result | ||
| AP4_Dac3Atom::WriteFields(AP4_ByteStream& stream) | ||
| { | ||
| return stream.Write(m_RawBytes.GetData(), m_RawBytes.GetDataSize()); | ||
| } | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | AP4_Dac3Atom::InspectFields | ||
| +---------------------------------------------------------------------*/ | ||
| AP4_Result | ||
| AP4_Dac3Atom::InspectFields(AP4_AtomInspector& inspector) | ||
| { | ||
| inspector.AddField("fscod", m_Fscod); | ||
| inspector.AddField("bsid", m_Bsid); | ||
| inspector.AddField("bsmod", m_Bsmod); | ||
| inspector.AddField("acmod", m_Acmod); | ||
| inspector.AddField("lfeon", m_Lfeon); | ||
| inspector.AddField("bit_rate_code", m_BitRateCode); | ||
|
|
||
| return AP4_SUCCESS; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /***************************************************************** | ||
| | | ||
| | AP4 - dac3 Atoms | ||
| | | ||
| | Copyright 2002-2008 Axiomatic Systems, LLC | ||
| | | ||
| | | ||
| | This file is part of Bento4/AP4 (MP4 Atom Processing Library). | ||
| | | ||
| | Unless you have obtained Bento4 under a difference license, | ||
| | this version of Bento4 is Bento4|GPL. | ||
| | Bento4|GPL 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, or (at your option) | ||
| | any later version. | ||
| | | ||
| | Bento4|GPL 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. | ||
| | | ||
| | You should have received a copy of the GNU General Public License | ||
| | along with Bento4|GPL; see the file COPYING. If not, write to the | ||
| | Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA | ||
| | 02111-1307, USA. | ||
| | | ||
| ****************************************************************/ | ||
|
|
||
| #ifndef _AP4_DAC3_ATOM_H_ | ||
| #define _AP4_DAC3_ATOM_H_ | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | includes | ||
| +---------------------------------------------------------------------*/ | ||
| #include "Ap4Atom.h" | ||
| #include "Ap4Array.h" | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | constants | ||
| +---------------------------------------------------------------------*/ | ||
|
|
||
| /*---------------------------------------------------------------------- | ||
| | AP4_Dac3Atom | ||
| +---------------------------------------------------------------------*/ | ||
| class AP4_Dac3Atom : public AP4_Atom | ||
| { | ||
| public: | ||
| AP4_IMPLEMENT_DYNAMIC_CAST_D(AP4_Dac3Atom, AP4_Atom) | ||
|
|
||
| // class methods | ||
| static AP4_Dac3Atom* Create(AP4_Size size, AP4_ByteStream& stream); | ||
|
|
||
| // methods | ||
| virtual AP4_Result InspectFields(AP4_AtomInspector& inspector); | ||
| virtual AP4_Result WriteFields(AP4_ByteStream& stream); | ||
| virtual AP4_Atom* Clone() { return new AP4_Dac3Atom(m_Size32, m_RawBytes.GetData()); } | ||
|
|
||
| // accessors | ||
| const AP4_DataBuffer& GetRawBytes() const { return m_RawBytes; } | ||
| unsigned int GetFscod() const { return m_Fscod; } | ||
| unsigned int GetBsid() const { return m_Bsid; } | ||
| unsigned int GetBsmod() const { return m_Bsmod; } | ||
| unsigned int GetAcmod() const { return m_Acmod; } | ||
| unsigned int GetLfeon() const { return m_Lfeon; } | ||
| unsigned int GetBitRateCode() const { return m_BitRateCode; } | ||
| unsigned int GetReserved() const { return m_Reserved; } | ||
|
|
||
| private: | ||
| // methods | ||
| AP4_Dac3Atom(AP4_UI32 size, const AP4_UI08* payload); | ||
|
|
||
| // members | ||
| unsigned int m_Fscod; | ||
| unsigned int m_Bsid; | ||
| unsigned int m_Bsmod; | ||
| unsigned int m_Acmod; | ||
| unsigned int m_Lfeon; | ||
| unsigned int m_BitRateCode; | ||
| unsigned int m_Reserved; | ||
| AP4_DataBuffer m_RawBytes; | ||
| }; | ||
|
|
||
| #endif // _AP4_DAC3_ATOM_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you want to support encrypted audio tracks, you could do so by changing this line to the following:
if (GetContext() == AP4_ATOM_TYPE_AC_3 || GetContext() == AP4_ATOM_TYPE_ENCA) {