diff options
author | Andreas Huber <andih@google.com> | 2009-08-27 14:50:58 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-08-27 14:50:58 -0700 |
commit | e0f0b08aa692d15f3bfa19e10abfc84803c099b4 (patch) | |
tree | 703584f606b9719817bd5ff42a3979a7576c1551 /include/media/IOMX.h | |
parent | 152755d265427fb47d836f1022585afab61e0350 (diff) | |
download | frameworks_av-e0f0b08aa692d15f3bfa19e10abfc84803c099b4.zip frameworks_av-e0f0b08aa692d15f3bfa19e10abfc84803c099b4.tar.gz frameworks_av-e0f0b08aa692d15f3bfa19e10abfc84803c099b4.tar.bz2 |
Squashed commit of the following:
commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:48:54 2009 -0700
Getting rid of more code now obsolete with the departure of OMXDecoder.
commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:33:06 2009 -0700
Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
Diffstat (limited to 'include/media/IOMX.h')
-rw-r--r-- | include/media/IOMX.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 58a74c7..0014d5c 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -119,12 +119,6 @@ struct omx_message { EMPTY_BUFFER_DONE, FILL_BUFFER_DONE, - // reserved for OMXDecoder use. - START, - INITIAL_FILL_BUFFER, - - // reserved for OMXObserver use. - QUIT_OBSERVER, } type; IOMX::node_id node; @@ -137,28 +131,21 @@ struct omx_message { OMX_U32 data2; } event_data; - // if type == EMPTY_BUFFER_DONE || type == FILL_BUFFER - // || type == INITIAL_FILL_BUFFER + // if type == EMPTY_BUFFER_DONE struct { IOMX::buffer_id buffer; } buffer_data; - // if type == EMPTY_BUFFER || type == FILL_BUFFER_DONE + // if type == FILL_BUFFER_DONE struct { IOMX::buffer_id buffer; OMX_U32 range_offset; OMX_U32 range_length; OMX_U32 flags; OMX_TICKS timestamp; - OMX_PTR platform_private; // ignored if type == EMPTY_BUFFER + OMX_PTR platform_private; } extended_buffer_data; - // if type == SEND_COMMAND - struct { - OMX_COMMANDTYPE cmd; - OMX_S32 param; - } send_command_data; - } u; }; |