| b18944c03c48d91fada0ae7bb364d056840f6dba |
19-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Prepare to move system/media"
|
| ee3ad477a71ba690f0b5721056a6514bf2f76bd8 |
16-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Fix indentation and redundant whitespace"
|
| 5321b3665e1a538cdcf894dea99d15c10b18ccf8 |
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Prepare to move system/media
Change-Id: Iac6dcfb72753e53e9a42b5feeaa2d6523f2395a4
ndroid.mk
|
| b47c7beddecd38ae565d84b72da526843bfdd43e |
08-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I584e6f6a3c52308b7a5a5c9980ca429c831f4320
ative-media-jni.c
|
| 7f7fde185e2739a88ba1847fa583a7dec459ea43 |
04-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: Id162f100e77d64cce4a12cd62b330e7cb847d816
ative-media-jni.c
|
| 22ced1dc023dc000118e3a26517b14e9babd7c5a |
12-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Fix indentation and redundant whitespace
Change-Id: I8e0193ad5aa9405f64203bf7814d8a9e434c5dde
ative-media-jni.c
|
| 738e761c42f146b655fa01707b82be25c2200d63 |
12-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Remove private ANativeWindow_fromSurfaceTexture
ANativeWindow_fromSurfaceTexture was a private API that is now deprecated
and is being removed in a separate CL. This change replaces all the
known uses by the preferred API ANativeWindow_fromSurface.
Note: a Surface can be derived from a SurfaceTexture by:
SurfaceTexture st = ...;
Surface s = new Surface(st);
// use s
s.release();
Change-Id: Ia55c023fc1487177ec76ae406ed77193083c9eac
ative-media-jni.c
|
| de7c7da8460de9fb1e8739978f25e1463e2e1666 |
26-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I4c0e3dc9da0a0cdf9aef8be4fae7b24da876dc17
ative-media-jni.c
|
| c3b82a293ed06001ba6d50f111608160c6065ef2 |
18-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Final revisions for NDK API level 14
Rename ANDROID_MIME_MP2TS to XA_ANDROID_MIME_MP2TS and
ANDROID_MIME_AACADTS to SL_ANDROID_MIME_AACADTS and make public.
ANDROID_MIME_AACADTS_ANDROID_FRAMEWORK remains private.
Change-Id: Ie2cda273b6adb2db453aad188b28e64147f9e6b0
ative-media-jni.c
|
| a07e6cd61b12a5c6ed78adaa88a08abd028f5a64 |
10-Sep-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 5236913 Update sample app for PLAYEVENT_HEADATEND with MP2TS
Update the sample application to receive the PLAYEVENT_HEADATEND
event after EOS has been processed.
Remove dead code in the corresponding implementation (in class
StreamPlayer).
Change-Id: Ibe484a8c0e9605c05cd47b154d6c0aff1e70d49e
ative-media-jni.c
|
| 6bc8af4e67051af7c86c311cb9c50e294e547500 |
09-Sep-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 5236913 Callback for MP2TS when EOS was processed
When the buffer containing the EOS item in the Android Buffer Queue
gets processed, make sure the application callback gets called.
Change-Id: I7476a908419ec99c52c3d3f3938de3f86ab926c6
ative-media-jni.c
|
| 60ca9f9ef02f6e486c3338cb811f603dd7825c05 |
29-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Rename Android buffer queue GUID for future sink
This change will make it easier to have Android buffer queue as a sink in
the future. For backwards source code compatibility with beta developers,
retain the old name temporarily. As soon as they have switched to the
new name, we will remove the old name.
Details:
- rename XA_IID_ANDROIDBUFFERQUEUE to XA_IID_ANDROIDBUFFERQUEUESOURCE
- rename SL_IID_ANDROIDBUFFERQUEUE to SL_IID_ANDROIDBUFFERQUEUESOURCE
- rename MPH_ANDROIDBUFFERQUEUE to MPH_ANDROIDBUFFERQUEUESOURCE
- did not rename the data locators and interface struct,
as they can be shared across both source and sink
- did not rename the member field mAndroidBufferQueue in
CAudioPlayer / CMediaPlayer as that would be a huge change;
can do that later if necessary
- the SINK definition will be added later when needed
Change-Id: I36dc01050efb99d4d7802b2ca2b870f4d978ee21
ative-media-jni.c
|
| ac8c7318e1d7ec1358bbf924e1bc2cee45b44fc6 |
19-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Add rewind (discontinuity) to native-media test
Change-Id: I0f32564d2a2937092436dd48fef877ed55b2d4f3
ndroid.mk
ative-media-jni.c
|
| c6853892c94800e72c0bd676d5d2136d48cea76e |
19-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Use the documented header filenames
Both Khronos and we say to use < > in our docs
Change-Id: Ibf1d2b83036582a605aa6b9043210c89a4eb0e1e
ative-media-jni.c
|
| 58432eb9cea995c69b4f905e68b38c1b8216edeb |
13-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Better defaults and fix warnings
Use better defaults for slesTestFeedback rxBufCount and channel count.
Fix build warnings.
Change-Id: Ieef4750cbc454029e61524cc8011a6c774088762
ative-media-jni.c
|
| 4c94f69ce3aafc6bafa265fe2ef448c621e66f15 |
17-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
resolved conflicts for merge of c5dcfeb2 to master
Change-Id: Iff3428cd554c5b5940da8a243c661ae70a92af8d
|
| 527f8ca99f2938d6569fc25dcf3256985a54dec6 |
16-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4106199 Split libOpenSLES.so & libOpenMAXAL.so
Change-Id: I718cf6bcfff51a6fb153928eb160a36b4ca9fc96
ndroid.mk
|
| 9a40703b539028b2dce5a62d94deb81375d75f6a |
16-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 7a713baa: Merge "Bug 4099084 native window data locator" into honeycomb-mr1
* commit '7a713baae6cac3740cc27380f1dc8099dd272470':
Bug 4099084 native window data locator
|
| 39310fca2e30101fa6e5168da443581cc60c20bf |
16-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4099084 native window data locator
Change-Id: I03cac7501c3f185a2f95395b140b52b695081c4b
ative-media-jni.c
|
| 6e0c1cc74aac0f9289df066f3fc7cc6aab954943 |
15-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
am fcc99629: Bug 3329759 Implement streamInformation and volume in OpenMAX AL
* commit 'fcc996296bdbf6c3949ad4312991fdde4ae2e157':
Bug 3329759 Implement streamInformation and volume in OpenMAX AL
|
| 37dc2fccf3f122b79ebd554de209d0a3c94ae161 |
09-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 Implement streamInformation and volume in OpenMAX AL
- Implement StreamInformation for video size notification.
- Implement the XAVolumeItf for volume control
- Fix bug in GUID -> MPH hash.
- Fixed typo in GenericPlayer::pause() log
- Do not signal a discontinuity automatically when the ABQ is
cleared because clearing the queue doesn't imply there will
be a discontinuity in the data (e.g. the same data that was
cleared could be reenqueued)
- In "native-media" test app: add test code to exercise the
XAVolumeItf functionality.
Change-Id: I9f69f8cacbdce51b6d96d60141ec1d0f645df991
ative-media-jni.c
|
| f62485fd570f004d0e336e4c2624a935a4a284cc |
14-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
system/media: remove LOCAL_PRELINK_MODULE
Change-Id: I55942287d5789a6297ab16f4049f529cb9f9e56c
Signed-off-by: Iliyan Malchev <malchev@google.com>
ndroid.mk
|
| b66b0745d45f4c0c7620749185f7fb3306804ce3 |
09-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3463332 Unified test/demo of video sink & APIs
Note: this only affects test code, nothing in the platform.
Can use for testing Java and native APIs
Video sinks is selectable as Surface (SurfaceView) or SurfaceTexture (GLSurfaceView)
Media source is selectable from drop-down list
Change-Id: I45fe16b672e0783ee89e0985b446b8ecc4f452e3
ative-media-jni.c
|
| 70c49ae2867094072a4365423417ea452bf82231 |
07-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 support commands in SLAndroidBufferQueueItf
Support for EOS, DISCONTINUITY, and DISCONTINUITY with
a PTS.
- in IAndroidBufferQueue structure, added buffer type
- modified AdvancedBufferHeader structure to have a buffer
type-specific structure that contains all the items for each
buffer
- added parsing of items when enqueueing a buffer
- enforce buffer size enqueue to be a multiple of MPEG-2 TS
block size for buffer of the corresponding types
- when enqueueing a buffer on an empty queue, implemented
an asynchronous notification on StreamPlayer to consume
the newly queued buffer. Verified this kicks off playback
after having starved the framework for buffers.
- report unknown duration when using AndroidBufferQueue
Change-Id: I9bde97a6c6ffca7d376b4963313b820b35f50a26
ative-media-jni.c
|
| ad1ab1d13a9b043202b9d5cdc1d8c4ef66cbbca8 |
05-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3329759 Surface texture as video sink
XA_DATALOCATOR_NATIVEDISPLAY now allows either a Surface or SurfaceTexture
together with a JNIEnv *.
Miscellaneous fixes:
- Clarify test button labels.
- Line length 100.
- Fix typos in XA_DATALOCATOR_ANDROIDFD and XA_DATALOCATOR_ANDROIDFD_USE_FILE_SIZE.
Change-Id: I3f3c604dfda3cf66ef7d7adc8689564a83623b2f
ative-media-jni.c
|
| d158d31a6bbb06426b71c3d097b7768bc3fb79a3 |
04-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 3329759 TS streaming over SLAndroidBufferQueueItf
Modify the SLAndroidBufferQueueItf interface to offer a model
where buffers of data can be queued along with commands
(messages) when used for playback, or buffers of data can be
received along with metadata (messages)
changes:
- new callback and enqueue functions in SLAndroidBufferQueueItf
and XAAndroidBufferQueueItf.
- definition of a new struct, AdvancedBufferHeader, for
the buffers in the queue.
- decoupling of the "buffer available to be filled" from SF
and the call to the ABQ callback. Implemented in new
file AndroidBufferQueueSource.cpp
- source/sink checks and memory allocation when creating an
AudioPlayer or MediaPlayer that uses SLAndroidBufferQueueItf,
and verifying the data fed to the ABQ is declared as
SL_CONTAINERTYPE_MPEG_TS
- updated tests/native-media XA demo code, and
tests/sandbox/streamSource to use the new interface.
Change-Id: I48e44f346e718041d835fde51e349923fcc1f4b1
ative-media-jni.c
|
| 262059f71a68edc5e510427c63f5f1623d3672a8 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Directory re-organization
Change-Id: I8e3f12a22e765d36ddefd87edf204735b25474f6
ndroid.mk
|
| f183d0fd23f1c0f45ceaf280d404f1b0709a699a |
07-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
OpenMAX AL example: remove useless includes
It's no longer necessary to include the OpenSL ES headers in
an OpenMAX AL application for the declaration of
XA_IID_ANDROIDBUFFERQUEUE.
Change-Id: I2077997087ff23db033ab69c498daf8eaaffedc9
ative-media-jni.c
|
| 295395c087000a9d804f8d12d58dea4cd9e7d26a |
15-Dec-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Use NDK API to initialize display surface in OpenMAX AL TS demo.
Use ANativeWindow functions defined in android/native_window_jni.h
to initialize the display surface to be used as video sink by the
OpenMAX AL MediaPlayer.
Change-Id: I36a91f4d9a928efa861ae0c01ea5856d4e36b46f
ndroid.mk
ative-media-jni.c
|
| 841a4d749b44b67f43a4dfad9dbc477e48f87529 |
14-Dec-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "OpenMAX AL: set video display surface from video sink"
|
| 0e47a0657162bbff48886ea2f5c68d9edb607768 |
14-Dec-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
OpenMAX AL: set video display surface from video sink
Initialize the media player's video surface with the surface pointer
obtained from the Java Surface.
Added notes on parts of the interface that will change, and are
currently in place for the sample code to run, before the
upcoming video initialization changes.
Change-Id: Id606f4bca68d227fa9df863922b880e865f845d5
ative-media-jni.c
|
| a0a5dfe5210c3e00e0d49b65a9bf23fcc43407a8 |
14-Dec-2010 |
Ying Wang <wangying@google.com> |
The correct tag is "tests", not "test"
Change-Id: Ib28337b6f2bf2598175dc697950c46a9c7e98b1b
ndroid.mk
|
| eae4df541ba1d46f65d37e959baf2127aa632c93 |
10-Dec-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Start support for XAAndroidBufferQueueItf in OpenMAX AL
Added an Android OpenMAX AL header for the Android interfaces
Registered the AndroidBufferQueueItf as an explicit
interface on MediaPlayer.
Updated the Java+Native example to register a callback from
which OpenMAX AL can retrieve the data to play
Started unifying the player object used by OpenMAX AL and
OpenSL ES so they use a common class.
Change-Id: I73cec8c802f74767545c91278e5e73c8c7995218
ative-media-jni.c
|
| 97bdbe13fc48640babe6c1ce270660476f04c3df |
07-Dec-2010 |
Glenn Kasten <gkasten@google.com> |
Native media test app
Change-Id: I2089733b4b4adc1d9da75a9c93c72b7c353c668f
ndroid.mk
ative-media-jni.c
|