[FFmpeg-soc] [PATCH] aacsbr: sbr_header default values

[Alex Converse]

Both bs_header_extra_1 and bs_header_extra_2 are marked with Note 3.

Note 3: If this bit is not set the default values for the underlying
data elements shall be used disregarded any previous value.

From 5de4223a1c93fcbd8abbf25b14193890dec8bcb9 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.conve...@gmail.com>
Date: Tue, 17 Nov 2009 12:56:04 -0500
Subject: [PATCH 4/5] Use sbr_header default values when none are provided.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1"

This is a multi-part message in MIME format.
--------------1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 aacsbr.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)


--------------1
Content-Type: text/x-patch; name="0004-Use-sbr_header-default-values-when-none-are-provided.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0004-Use-sbr_header-default-values-when-none-are-provided.patch"

diff --git a/aacsbr.c b/aacsbr.c
index 137bbf7..3cacf92 100644
--- a/aacsbr.c
+++ b/aacsbr.c
@@ -96,6 +96,10 @@ static unsigned int sbr_header(SpectralBandReplication *sbr, GetBitContext *gb)
         sbr->spectrum_params[1].bs_freq_scale  = get_bits(gb, 2);
         sbr->spectrum_params[1].bs_alter_scale = get_bits1(gb);
         sbr->spectrum_params[1].bs_noise_bands = get_bits(gb, 2);
+    } else {
+        sbr->spectrum_params[1].bs_freq_scale  = 2;
+        sbr->spectrum_params[1].bs_alter_scale = 1;
+        sbr->spectrum_params[1].bs_noise_bands = 2;
     }
 
     // Check if spectrum parameters changed
@@ -108,6 +112,11 @@ static unsigned int sbr_header(SpectralBandReplication *sbr, GetBitContext *gb)
         sbr->bs_limiter_gains  = get_bits(gb, 2);
         sbr->bs_interpol_freq  = get_bits1(gb);
         sbr->bs_smoothing_mode = get_bits1(gb);
+    } else {
+        sbr->bs_limiter_bands  = 2;
+        sbr->bs_limiter_gains  = 2;
+        sbr->bs_interpol_freq  = 1;
+        sbr->bs_smoothing_mode = 1;
     }
 
     return get_bits_count(gb) - cnt;

--------------1--



_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc