summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrnb/common/include
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2012-03-01 15:03:29 +0200
committerMartin Storsjo <martin@martin.st>2012-07-10 13:44:12 +0300
commit448239b929de32621e26504b86482ab4d436a5e3 (patch)
tree6aafea7385c35db97a52c659ae9990894de8b449 /media/libstagefright/codecs/amrnb/common/include
parentffb829430ff20ccd6c13e6ed894f2373b2d93939 (diff)
downloadframeworks_av-448239b929de32621e26504b86482ab4d436a5e3.zip
frameworks_av-448239b929de32621e26504b86482ab4d436a5e3.tar.gz
frameworks_av-448239b929de32621e26504b86482ab4d436a5e3.tar.bz2
stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
Change-Id: I6d6f9dc5799750394a853325466ffa2ebec44625
Diffstat (limited to 'media/libstagefright/codecs/amrnb/common/include')
-rw-r--r--media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h b/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
index 3ebd929..3d482be 100644
--- a/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
+++ b/media/libstagefright/codecs/amrnb/common/include/frame_type_3gpp.h
@@ -105,6 +105,34 @@ extern "C"
AMR_NO_DATA /* No data */
};
+typedef enum
+{
+ /*
+ * One word (2-byte) to indicate type of frame type.
+ * One word (2-byte) to indicate frame type.
+ * One word (2-byte) to indicate mode.
+ * N words (2-byte) containing N bits (bit 0 = 0xff81, bit 1 = 0x007f).
+ */
+ ETS = 0, /* Both AMR-Narrowband and AMR-Wideband */
+
+ /*
+ * One word (2-byte) for sync word (good frames: 0x6b21, bad frames: 0x6b20)
+ * One word (2-byte) for frame length N.
+ * N words (2-byte) containing N bits (bit 0 = 0x007f, bit 1 = 0x0081).
+ */
+ ITU, /* AMR-Wideband */
+
+ /*
+ * AMR-WB MIME/storage format, see RFC 3267 (sections 5.1 and 5.3) for details
+ */
+ MIME_IETF,
+
+ WMF, /* AMR-Narrowband */
+
+ IF2 /* AMR-Narrowband */
+
+} bitstream_format;
+
/*----------------------------------------------------------------------------
; STRUCTURES TYPEDEF'S
----------------------------------------------------------------------------*/