Merge the tizen patch and fix build err based on 1.12.2

[platform/upstream/gst-plugins-good.git] / gst / audioparsers / gstaacparse.h

diff --git a/gst/audioparsers/gstaacparse.h b/gst/audioparsers/gstaacparse.h
index 1907c2e..1cde1f6 100644 (file)
--- a/gst/audioparsers/gstaacparse.h
+++ b/gst/audioparsers/gstaacparse.h
@@ -15,8 +15,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 #ifndef __GST_AAC_PARSE_H__
@@ -45,6 +45,7 @@ G_BEGIN_DECLS
  * @DSPAAC_HEADER_UNKNOWN: Unknown (not recognized) header.
  * @DSPAAC_HEADER_ADIF: ADIF header found.
  * @DSPAAC_HEADER_ADTS: ADTS header found.
+ * @DSPAAC_HEADER_LOAS: LOAS header found.
  * @DSPAAC_HEADER_NONE: Raw stream, no header.
  *
  * Type header enumeration set in #header_type.
@@ -54,6 +55,7 @@ typedef enum {
   DSPAAC_HEADER_UNKNOWN,
   DSPAAC_HEADER_ADIF,
   DSPAAC_HEADER_ADTS,
+  DSPAAC_HEADER_LOAS,
   DSPAAC_HEADER_NONE
 } GstAacHeaderType;
 
@@ -77,7 +79,27 @@ struct _GstAacParse {
   gint           mpegversion;
   gint           frame_samples;
 
+#ifdef TIZEN_FEATURE_AACPARSE_MODIFICATION
+  gboolean       first_frame; /* estimate duration once at the first time */
+  guint          hdr_bitrate;      /* estimated bitrate (bps) */
+  guint          spf;                      /* samples per frame = frame_samples */
+  guint          frame_duration; /* duration per frame (msec) */
+  guint          frame_per_sec; /* frames per second (ea) */
+  guint          bitstream_type; /* bitstream type - constant or variable */
+  guint          adif_header_length;
+  guint          num_program_config_elements;
+  guint          read_bytes;
+  gint64         file_size;
+  guint          frame_byte;
+#endif
+
   GstAacHeaderType header_type;
+  GstAacHeaderType output_header_type;
+
+  gboolean sent_codec_tag;
+
+  gint last_parsed_sample_rate;
+  gint last_parsed_channels;
 };
 
 /**