Remove default stream-format field for aac

- If set to raw stream-format and no codec_data, an error occurs in aacparse.
- Remove aac related functions in caps recipes

[Version] 0.0.25

Change-Id: I8773c59eb44128a239cf1c24746315a555131cf9

diff --git a/packaging/libtrackrenderer.spec b/packaging/libtrackrenderer.spec
index be0852d..c47b75c 100644 (file)
--- a/packaging/libtrackrenderer.spec
+++ b/packaging/libtrackrenderer.spec
@@ -1,6 +1,6 @@
 Name:       libtrackrenderer
 Summary:    new multimedia streaming player trackrenderer
-Version:    0.0.24
+Version:    0.0.25
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/caps_recipes.cpp b/src/caps_recipes.cpp
index b625ee8..24ab11d 100644 (file)
--- a/src/caps_recipes.cpp
+++ b/src/caps_recipes.cpp
@@ -33,33 +33,12 @@ void FillMpeg1(const GstCapsWrapper& caps, const Track& track) {
 }
 
 bool CheckAac(const Track& track) {
-  return (track.version == 2 || track.version == 4) && track.layer == 0;
+  return (track.version == 2 || track.version == 4);
 }
 void FillAac(const GstCapsWrapper& caps, const Track& track) {
   caps.SetValue("mpegversion", G_TYPE_INT, track.version);
   caps.SetValue("framed", G_TYPE_BOOLEAN, true);
   caps.SetValue("bitrate", G_TYPE_INT, track.bitrate);
-  caps.SetValue("stream-format", G_TYPE_STRING, "raw");
-}
-
-bool CheckAacWithAdtsHeader(const Track& track) {
-  return (track.version == 2 || track.version == 4) && track.layer == 1;
-}
-void FillAacWithAdtsHeader(const GstCapsWrapper& caps, const Track& track) {
-  caps.SetValue("mpegversion", G_TYPE_INT, track.version);
-  caps.SetValue("framed", G_TYPE_BOOLEAN, true);
-  caps.SetValue("bitrate", G_TYPE_INT, track.bitrate);
-  caps.SetValue("stream-format", G_TYPE_STRING, "adts");
-}
-
-bool CheckAacWithAdifHeader(const Track& track) {
-  return (track.version == 2 || track.version == 4) && track.layer == 2;
-}
-void FillAacWithAdifHeader(const GstCapsWrapper& caps, const Track& track) {
-  caps.SetValue("mpegversion", G_TYPE_INT, track.version);
-  caps.SetValue("framed", G_TYPE_BOOLEAN, true);
-  caps.SetValue("bitrate", G_TYPE_INT, track.bitrate);
-  caps.SetValue("stream-format", G_TYPE_STRING, "adif");
 }
 
 /* =========================================
@@ -327,10 +306,6 @@ const GstCapsBuilder::Recipes TrackRenderer::kCapsRecipes_ = {
      {
          {track::audio::CheckMpeg1, track::audio::FillMpeg1},
          {track::audio::CheckAac, track::audio::FillAac},
-         {track::audio::CheckAacWithAdtsHeader,
-          track::audio::FillAacWithAdtsHeader},
-         {track::audio::CheckAacWithAdifHeader,
-          track::audio::FillAacWithAdifHeader},
      }},
     {"audio/x-raw",
      {