From 6420c42ac5af11f596fcf09e127f12fbc91857f1 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Fri, 31 Jan 2014 18:20:30 +0100
Subject: [PATCH] Re-added the last toAACInit funtion to MP4::AudioSampleEntry
---
lib/mp4_generic.cpp | 8 ++++++++
lib/mp4_generic.h | 1 +
2 files changed, 9 insertions(+)
diff --git a/lib/mp4_generic.cpp b/lib/mp4_generic.cpp
index 61373ac1..9a3d31d1 100644
--- a/lib/mp4_generic.cpp
+++ b/lib/mp4_generic.cpp
@@ -2590,6 +2590,14 @@ namespace MP4{
setSampleSize(16);
setSampleRate(44100);
}
+
+ uint16_t AudioSampleEntry::toAACInit(){
+ uint16_t result = 0;
+ result |= (2 & 0x1F) << 11;
+ result |= (getSampleRate() & 0x0F) << 7;
+ result |= (getChannelCount() & 0x0F) << 3;
+ return result;
+ }
void AudioSampleEntry::setCodec(const char* newCodec){
memcpy(data + 4, newCodec, 4);
diff --git a/lib/mp4_generic.h b/lib/mp4_generic.h
index f66667bc..e6d39054 100644
--- a/lib/mp4_generic.h
+++ b/lib/mp4_generic.h
@@ -592,6 +592,7 @@ namespace MP4{
void setPreDefined(uint16_t newPreDefined);
uint16_t getPreDefined();
void setSampleRate(uint32_t newSampleRate);
+ uint16_t toAACInit();
uint32_t getSampleRate();
void setCodecBox(Box& newBox);
Box & getCodecBox();