bringup 4.3 media-caf
use common
Squashed commit of the following:

N/A

commit 38c9b09fc4149d561ad369fc6a512d138157f557
Merge: 5d97dc1 2e97ad8
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Sep 9 14:22:20 2013 -0700

    Merge branch 'jb_2.6_1' of git://codeaurora.org/platform/hardware/qcom/media into cm-10.2

commit 2e97ad80cda38788503e6f29ff09416c521230dd
Merge: df0c6cb 0dd3c80
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Aug 30 08:03:58 2013 -0700

    Merge "libc2dcolorconvert: use c2dMapAddr() and c2dUnMapAddr"

commit 0dd3c80c761b072a1f3e3696f39e270ad2db76a9
Author: Jeremy Gebben <jgebben@codeaurora.org>
Date:   Mon Jul 15 11:02:14 2013 -0600

    libc2dcolorconvert: use c2dMapAddr() and c2dUnMapAddr

    These apis are the preferred way to map ION memory into C2D,
    instead of direct kgsl calls.

    Change-Id: I74de60c1a407aa507e3f47edc5074b4df3928da3

commit 5d97dc1774d721f9ae75d22d70f457282a917042
Merge: da280a0 15439a4
Author: Steve Kondik <shade@chemlab.org>
Date:   Mon Aug 26 20:58:42 2013 -0700

    Merge branch 'jb_2.6_1' of git://codeaurora.org/platform/hardware/qcom/media into cm-10.2

    Change-Id: Ia4020577a1496f185f49bedd0fa218b3f39b7c30

commit df0c6cbfab3d62fbfb5d9c6646fa6bcb0f8fe1a0
Merge: 4c6b911 26e6b4c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Aug 23 05:21:15 2013 -0700

    Merge "dashplayer: Delete memory allocated for cached crops and formats"

commit 4c6b911568aa6eaeab167940662d37fc9bf7c242
Merge: 37dfc01 741b918
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Aug 23 05:21:12 2013 -0700

    Merge "QCMetaData: Add key for interlace"

commit 26e6b4ccf17aaa536b85c1d6d8a0efde31e4b97a
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu Aug 22 12:29:11 2013 +0530

    dashplayer: Delete memory allocated for cached crops and formats

    Delete dynamically allocated memory allocated for cached crops
    and formats.

    Change-Id: Ib0d66f723bf9a66d308b8c786ef8de1efc1627a0

commit 37dfc0131d99771e815996c3945cb862a472aeb3
Merge: ee0726a 0ffbf2e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Aug 21 12:18:23 2013 -0700

    Merge "dashplayer:  Fix for Progress bar moving back in seek."

commit ee0726a8a9c295a5361efb9ff7a25b5b791d0c99
Merge: e219723 d175cbb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Aug 20 20:42:17 2013 -0700

    Merge "mm-video: venc: Distinguish between normal NV12 and aligned NV12"

commit e219723ff12f57f9116e0494761afb198140ed54
Merge: 15439a4 d175cbb
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Aug 20 06:44:54 2013 -0700

    Merge "mm-video: venc: Distinguish between normal NV12 and aligned NV12"

commit 0ffbf2ec82008953e2b0b0959ca3af09ed25c692
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Tue Aug 20 14:26:43 2013 +0530

    dashplayer:  Fix for Progress bar moving back in seek.

    Fix for progress bar moving back in seek by calling
    kWhatposition from renderer using new seektime

    Change-Id: I30ce962cca58cdce5bd56e9f4ed6963ebd80de7a

commit d175cbbd39b6acdb1c0d76e621777db092f23df4
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Aug 16 17:19:08 2013 +0530

    mm-video: venc: Distinguish between normal NV12 and aligned NV12

    Encoder has a hard-requirement of 2K alignment of UV plane.
    Apps and other non-camera sources (not aware of this alignment)
    will queue YUV420SP buffers, which need an explicit alignment.
    But for some other apps(e.g VT) that are aware that the component
    wants aligned NV12 and would align it themselves, causing the component
    to muck up the buffer by realigning it.

    To prevent the confusion, the component now makes a distinction between
    NV12 (OMX_COLOR_FormatYUV420SemiPlanar) and aligned NV12 (QOMX_COLOR_\
    FORMATYUV420PackedSemiPlanar32).  Clients who prefer to provide aligned
    buffers will now set the latter as the input port format.

    Change-Id: I73c337660fb825e9b267663266fd4b9d6e35443e

commit 15439a46d86e145065e9a5b095c36fc03b8a1053
Merge: d7ef1c7 8ee055e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 21:40:09 2013 -0700

    Merge "libc2dcolorconvert: Fix CTS Failures for 720p Encoding on 8930."

commit d7ef1c7a94a31b81bff7f764159ca4182ab7ba06
Merge: dbc1555 27dd855
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:29 2013 -0700

    Merge "DashPlayer: Don't queue EOS in flushing state"

commit dbc1555d65fee83521f0c288b65c0fbc8703ddf7
Merge: 74119be a5a9c9d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:28 2013 -0700

    Merge "DashPlayer: Notify seek position to dash source"

commit 74119be4022bc16bdb657a8b4615041bf6c02ca8
Merge: 89fef90 23941a6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:27 2013 -0700

    Merge "DashPlayer: Add support for dumpsys in DashPlayer"

commit 89fef900d481f5470ac4e90230af4ed61c3a74a2
Merge: b8af78e d044266
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:26 2013 -0700

    Merge "DashPlayer: Notify position for video EOS buffer immediately"

commit b8af78e96560d14ba51c7b5cdb25bf7c427cdcb2
Merge: d68b17a 3aaafe3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:26 2013 -0700

    Merge "Fix for the flicker while changing the resolution in DashPlayer"

commit d68b17a9eee4d76def07689adfd873ba268bfd1a
Merge: 66f86ae 3fdda62
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:25 2013 -0700

    Merge "DashCodec: keep cache of formats to support b2b format change"

commit 66f86ae774cfe535a8073600cbc56e542966b0ea
Merge: 6e3b4c4 ce64e9c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:24 2013 -0700

    Merge "dashplayer: Fix green frame issue on session timeout"

commit 6e3b4c42baaaf0be573653f41ba93d1b30cab4d7
Merge: dde78ee 5e46f34
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Aug 12 11:45:19 2013 -0700

    Merge "dashplayer: fix wrongly identifying a Dash URL"

commit da280a05e4375e3359daa5955eeac3950667712b
Author: Arne Coucheron <arco68@gmail.com>
Date:   Sun Aug 11 00:40:12 2013 +0200

    mm-core: Remove double declaration of OMX.qcom.audio.decoder.aac

    Change-Id: I0d64cde98ab92c48fe9e70d26724c334f22a79f6

commit 8ee055e25d0559a6d9486397d77553c575197190
Author: Vasantha Balla <vballa@codeaurora.org>
Date:   Thu Aug 8 17:48:20 2013 +0530

    libc2dcolorconvert: Fix CTS Failures for 720p Encoding on 8930.

     -CTS testcases testEncodeDecodeVideoFromSurfaceToSurface720p
      and testVideoEdit720p fails because graphic buffer
      stride value is different for 8930.
     -Extra padding is needed for 8930 graphic buffers this case
      needs to be handled in C2D colorconverter before color
      conversion process.
     -Fix is to keep same stride value as of graphic bufer source
      in colorconverter module for 8930.
     CRs-Fixed: 515586

    Change-Id: I45cdbd0ad4cad00f3e87c5f32852fc28f279aee9

commit 741b918cda9702f59e252299b3fd3fad89f482c8
Author: Riaz Rahaman <riazr@codeaurora.org>
Date:   Wed Aug 7 13:29:54 2013 +0530

    QCMetaData: Add key for interlace

    key for interlace set in metadata is being used for thumbnail mode.
    If the key is set, two ETB are send to the decoder

    Change-Id: I1e4e996f46f022916ab5f4f14ff2c111f04717c1

commit 27dd855ee8d1ebeb8aabbb9e9790421b5ba50475
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Fri Jun 7 11:08:15 2013 +0530

    DashPlayer: Don't queue EOS in flushing state

    Don't queue EOS to renderer in flushing state.

    Change-Id: I04925c3b99c1b43281eb8c43be5943194a3bd48b

commit a5a9c9d03a40aaf0fb15467bac459b6152e30321
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu May 30 10:26:32 2013 +0530

    DashPlayer: Notify seek position to dash source

    Notify seek position to dash source to make sure that
    if text samples arrive before audio/video, the time
    out for sending text samples is not wrongly calculated.

    CRs-Fixed: 492376

    Change-Id: I952e474d92936532956c1d456b6ad1d554402405

commit 23941a64a4415ea1f5f19e594c88cab9b9ed647a
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu May 30 13:49:02 2013 +0530

    DashPlayer: Add support for dumpsys in DashPlayer

    Added functionality in DashPlayer to dump playback statistics to file.

    Change-Id: I0f95684f10db376731f622f06d17cc262480ecd3

commit d04426645319cd8792cf90e46b50f1b24c82575c
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Wed May 22 14:06:31 2013 +0530

    DashPlayer: Notify position for video EOS buffer immediately

    Notify current rendering position for video EOS buffer immediately,
    without waiting for 100ms between subsequent updates.

    CRs-Fixed: 489546
    Change-Id: I9a8f346a68ff5c333d96e5ae24980e0ed1b27903

commit 3aaafe3b2ba733d87ae71ed6804b872352206cdf
Author: huiyQuic <huiyQuic@codeaurora.org>
Date:   Mon Mar 18 18:02:41 2013 -0700

    Fix for the flicker while changing the resolution in DashPlayer

    - Just notify the message of MEDIA_SET_VIDEO_SIZE to JAVA Layer,
      while beginning to play the streaming.
    - After the streaming begin to play, don't notify this message,
      while changing the resolution or seek operation finished.
    - If we don't set video size,
      windowsmanager will adapt the dimension of the clip by itself.

    Change-Id: I6a79d13159cd9bf33e0f483c7e1b71690f071011

    CRs-fixed: 451993

commit 3fdda62215bf832d4966aef7a17677ad24480875
Author: Eric (Quic <yinlokh@codeaurora.org>
Date:   Wed Apr 17 11:00:01 2013 -0700

    DashCodec: keep cache of formats to support b2b format change

         - when format change takes place too fast, it will pick up wrong
           format.
         - keep a cache of formats and only issue one sendFormatChange per
           crop change.
         - clear format cache when flushing

    Change-Id: Ib45f3c5ac7764b4dd1edc4ac6c6f11390c33c151
    CRs-Fixed: 475092

commit ce64e9cd1dfc47df6b867c21571ccfaf211d26d9
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Wed Apr 24 16:42:19 2013 +0530

    dashplayer: Fix green frame issue on session timeout

    * Avoid rendering video buffer which signals EOS as it does
      not contain valid video data.

    CRs-Fixed: 476333

    Change-Id: I10e3a0cb1e2dc9e1574d5e2b05f6339e868ac6fe

commit dde78eefd92a2a805b8d63538fca8347b3df8ee0
Merge: 098e1a0 c2fc8d0
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jul 31 03:32:47 2013 -0700

    Merge "mm-core: Add hevc coding type in mm-core"

commit 098e1a04d8972ed07e031d3f51fa23f37e5dfb8d
Merge: 4f742fe 03f1295
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jul 31 01:02:24 2013 -0700

    Merge "vidc: venc: Add LTR feature for H264 encoder"

commit c2fc8d0f0977faf53e469f275cd54a2b5787211a
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Wed Jul 31 11:32:40 2013 +0530

    mm-core: Add hevc coding type in mm-core

    This change adds the hevc coding type to mm-core.

    Change-Id: Icb2a91805061d149d5fcc160928cdec8ca0e5647

commit 4f742fefcc19fdadf9c3c7f23758c19477af9ad4
Merge: a6af6ae bc8f2e7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 30 20:28:34 2013 -0700

    Merge "DashPlayer: Remove mSource null check in source notify"

commit a6af6ae31634b6c6a58c8e95f31869a21b16d398
Merge: 6b9d77c c5c8b8e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 30 20:28:31 2013 -0700

    Merge "DashPlayer: Don't queue EOS in flushing state on error from codec"

commit 5e46f343e17d2ff1e3d789a42458aaa520dc975a
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu Jul 18 15:07:16 2013 +0530

    dashplayer: fix wrongly identifying a Dash URL

    - do not identify URL as Dash if URL has random "mpd" string

    Change-Id: I40fefa311bca99e19c4f1e4cee3bd09bd21e4908

commit 714780140e3203530ce0eb343364f624c0844c0f
Merge: 5234181 6b9d77c
Author: Steve Kondik <shade@chemlab.org>
Date:   Fri Jul 26 12:12:41 2013 -0700

    Merge branch 'jb_2.6_1' of git://codeaurora.org/platform/hardware/qcom/media into cm-10.2

    Change-Id: I13b3f4f319d0e9b2719aed814860f3381cdafb47

commit c5c8b8eeb7f56ca84ea224447df0321f9d9f29a7
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Fri Jul 26 18:37:11 2013 +0530

    DashPlayer: Don't queue EOS in flushing state on error from codec

    Don't queue EOS to renderer in flushing/flushed state on error from
    codec

    Change-Id: I3b359c2f6700d9eed5b99515d652f86557c55a9f
    CRs-Fixed: 515232

commit bc8f2e7e4b730d2bdc12628fa9c64a261c32b3d4
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu Jul 25 12:53:57 2013 +0530

    DashPlayer: Remove mSource null check in source notify

    Remove mSource null check in source notify

    Change-Id: I5f35f90246f73f421962e4510011698366c07823
    CRs-Fixed: 515690

commit 6b9d77c3258a777937e7ad0978b0329d6901e049
Merge: 14e08f0 d7e7017
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jul 22 21:34:13 2013 -0700

    Merge "mm-core: Add MediaDefs for new QC parsers"

commit 14e08f0dc068144dcff3a074904a3392a0981cd4
Merge: 661ed56 0ee5390
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jul 22 03:37:15 2013 -0700

    Merge "mm-video: vdec: Update output buffer count in thumbnail mode"

commit 0ee5390aa38ba93d3ec91e9a8874fcb2da8a447f
Author: Pavan Chikkala <pavanc@codeaurora.org>
Date:   Fri Jul 19 18:51:30 2013 +0530

    mm-video: vdec: Update output buffer count in thumbnail mode

    This change updates the output buffer requirements when thumbnail mode
    is enabled. In thumbnail mode the required output buffers equal to 1.
    Output Buffer required for thumbnail mode were not updated earlier from
    the driver as a result of which allocating memory for default buffer
    count failed and thumbnail were not shown for some file formats.

    Change-Id: I607a5b0e3bfcad8056ff71557db50d0e268cf348
    CRs-Fixed: 513180

commit 661ed56dd2878def53808820f2be8b0c6e217b8d
Merge: b13dc60 598b597
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Jul 19 00:35:34 2013 -0700

    Merge "mm-video: venc: Align chroma to 2K for non-camera YUV420SP input"

commit d7e7017dcc0558ae745b79dd10ccde7bc79fb979
Author: Jayasena Sangaraboina <jsanga@codeaurora.org>
Date:   Mon Apr 8 15:40:01 2013 -0700

    mm-core: Add MediaDefs for new QC parsers

    - Add MediaDefs for new QC parsers

    Change-Id: I330ec98b83aff6564ec4bb1848fcf2f1b05eeba1

commit 598b5979959c118ebc35e2aaa36d27c0579988ba
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jun 7 22:29:43 2013 +0530

    mm-video: venc: Align chroma to 2K for non-camera YUV420SP input

    Encoder has a hard-requirement of 2K alignment of UV plane.
    Apps and other non-camera sources (not aware of this alignment)
    will queue YUV420SP buffers, which need an explicit alignment

    Change-Id: I9d23fc6c0fb935bc8d20e3e454e80272d6188652

commit 03f12950d02f2086a2a59c79c3fd59d2f1a67f64
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Mon Jul 8 20:20:32 2013 +0530

    vidc: venc: Add LTR feature for H264 encoder

    This commit adds Long Term Reference picture
    selection feature for H264 video encoder and
    also adds the corresponding video extensions

    Change-Id: Iaf2228c3f29261db4f0214b3264648745b2aaa4d

commit b13dc605f5e164e8e652e9df8d4423085b6fe620
Merge: 74e8be2 4ec6976
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jul 11 08:48:50 2013 -0700

    Merge "DashCodec: Changes to bringup DASH on MR2"

commit 74e8be21eb64948306282585d1a8fca7f5c85d69
Merge: 555ad42 e4755a6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jul 11 08:48:49 2013 -0700

    Merge "DashPlayer: make jb_mr2 compatible ."

commit 555ad4272619882fcf41c158ed85973ea6a35af8
Merge: 78ca98b d2314d1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jul 11 03:17:59 2013 -0700

    Merge "vidc: vdec: Open secure display after video driver opened"

commit 78ca98b692b814ec2f76258e74f81968b6d63b1d
Merge: 50044fc 1e19c47
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jul 11 03:17:58 2013 -0700

    Merge "mm-video: Get current performance level of video driver"

commit 50044fc8219c28e64891cb0beeee10a82e785157
Merge: b091030 554882c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jul 11 03:17:54 2013 -0700

    Merge "mm-video: vidc: Synchronize ION alloc and free APIs"

commit 4ec6976052a70dd860bb7c283ef6ada2d9100a06
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Fri Jul 5 14:04:13 2013 +0530

    DashCodec: Changes to bringup DASH on MR2

    *Disable AMR_WB audio support.
    *Remove OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m from supported
     output color format

    Change-Id: I4e675199a7e012d81f71dc027baa722b5eaa5281

commit e4755a6282078d5cb480299134df4f73a049f7a3
Author: Eric (Quic <yinlokh@codeaurora.org>
Date:   Wed Jun 12 15:41:06 2013 -0700

    DashPlayer: make jb_mr2 compatible .

     - ISurfaceTexture is called IGraphicBufferProducer in jb_mr2
     - SurfaceTextureClient is called Surface in jb_mr2

    Change-Id: I790f49dd0cd2a155918155a6bae3badb5e412976

commit d2314d1f2590a308171056d7c7f3c25f39e7df14
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Jun 27 11:48:16 2013 +0530

    vidc: vdec: Open secure display after video driver opened

    Open secure display after video driver successfully opened.
    This change will resolve the non-secure video playback
    failures when secure video driver open failed cases.

    Change-Id: I739c1f387d131a9285f755840ff45f0c9d47dee1

commit 1e19c47607a9a59c0b9b41a782a6603c14f1e6f5
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Jul 8 18:09:08 2013 +0530

    mm-video: Get current performance level of video driver

    Get current performance level of video driver. Client can
    use this info to decide whether to start another video
    session in parallel or not.

    Change-Id: I95da6e2b995230bec6469845c84e66f6e3c92816

commit 554882c8134ca0319dc982411bb2a3f27764207e
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Mon Jun 17 21:33:02 2013 +0530

    mm-video: vidc: Synchronize ION alloc and free APIs

    This change synchronizes ION alloc and free APIs
    between different video instances by having
    static mutex varible. This change also makes
    changes to use single ION device fd for all the
    video buffers instead of having different ION
    device fds for each buffer.
    This change resolves the blank thumbnails issue
    in Movie Studio application.

    Change-Id: I1f0721d8a65a8a4fec2f8bf2a702ccfdaf0da114

commit b091030234c29e0334c330c047a009c5b535351c
Merge: 1d13f8f 251cad7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:59 2013 -0700

    Merge "mm-video: vdec: Initialize fd values to avoid memory corruption."

commit 1d13f8fe6bfeca02250e0252f40c482688553b3e
Merge: cdf466e 99215d2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:54 2013 -0700

    Merge "mm-video: vdec: Fix movie studio crash"

commit cdf466e77a832a29a919158a199c169b2a6751d8
Merge: e9bd89d f43624a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:49 2013 -0700

    Merge "mm-video: vidc: Setprop command support for uncache buffers"

commit e9bd89dccb39e9f00d3e51513f5e1ae4a8536155
Merge: 04e421d 9563da2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:44 2013 -0700

    Merge "mm-video: vdec: Allow client to set TURBO mode"

commit 04e421db60b29179423a5a9ea784daa603f0d577
Merge: 5492b85 eda8507
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:39 2013 -0700

    Merge "mm-video: vidc: Enable data corrupt flag for MPEG2 & VC1 only"

commit 5492b857536f10a7be6af49bd093bce615eec319
Merge: 087b702 2be114e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:38 2013 -0700

    Merge "mm-video: Add data corrupt flag on output buffers when required"

commit 087b70258b99cf7859aa9c7a86be92b9c5a423b1
Merge: c1b2df9 6193d23
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jul 9 06:12:33 2013 -0700

    Merge "mm-video: Adjust 3 byte start code address, if multiple DMX entries found"

commit c1b2df9a899708f4c70eda591b603dc851e9755d
Merge: d4f83ef 160aca3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jul 8 05:30:50 2013 -0700

    Merge "mm-video: revert usage of flag GRALLOC_USAGE_PRIVATE_CP_BUFFER"

commit 9563da2afd596b84c6c9b8118be343d93445ee54
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Jul 8 17:06:56 2013 +0530

    mm-video: vdec: Allow client to set TURBO mode

    - Allow client to set TURBO mode to video decoder.
    - TURBO mode sets the maximum supported
      perfomance level to video driver.
    - Based on frame drops due to delayed video frames
      client can set TURBO mode to video decoder when
      required.

    Change-Id: I4508d8df2af8a64057ea47fcf18820b2524c7aa3

commit eda85077497bb1fc06be7d2c19adb51b88cb279d
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jun 28 18:26:58 2013 +0530

    mm-video: vidc: Enable data corrupt flag for MPEG2 & VC1 only

    - Update output buffers with data corrupt flag when required
      for MPEG2 and VC1 decoders only.
    - Enable data corrupt flag irrespective of frame type if sync
      frame not received.
    - Don't set data corrupt flag at the start of the playback and
      set when seek operation is made and sync frame not received yet.

    Change-Id: I9751d41f57af741a0762821a103e8581ce4f8b28

commit 2be114ea62794efd795bf4cc7ef0098323f78c67
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Jul 8 16:35:43 2013 +0530

    mm-video: Add data corrupt flag on output buffers when required

    - If non-IDR frames received after seek operation, corrupted YUV frames
      are displayed.
    - Add OMX_BUFFERFLAG_DATACORRUPT flag to each output buffer till
      OMX_BUFFERFLAG_SYNCFRAME received.
    - IL client can skip rendering if DATACORRUPT flag observed.

    Change-Id: I735fb3d5dcfbbfd0efd3c77a59f0323ee7695c10

commit 251cad739da42885deab916ff8cea65ca0c438c1
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Jul 8 16:21:05 2013 +0530

    mm-video: vdec: Initialize fd values to avoid memory corruption.

    When driver open fails, we try to close uninitialized
    fds which may contain any junk value. Thus, closing fd
    with these junk values may result in memory corruption.

    Change-Id: Ie3d4226022567e4ed929ed8c8c0fd44334351450

commit f43624acc6f66ddd86e7922926c640b76eea57fc
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Wed Jun 5 18:34:46 2013 +0530

    mm-video: vidc: Setprop command support for uncache buffers

    The video playback buffers can be allocated as uncache buffers
    when requried using below setprop command

    setprop persist.video.mem.usecache 0

    The video recording buffers can be allocated as uncache buffers
    when required using below setprop command

    setprop persist.camera.mem.usecache 0

    By default all the buffers are allocated as cache buffers.

    Change-Id: Ic68414cf42afa2b8467a821fae31bda3fd10045f

commit 99215d2452db7d2388a7ec60716681f34ce582cd
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Thu May 16 19:19:21 2013 +0530

    mm-video: vdec: Fix movie studio crash

    This change updates crop information with latest data
    available with the driver.

    CRs-fixed: 487314
    Change-Id: I04a54a47b34442cf38695913f5a97eb5663e36da

commit 6193d230edb64d685ada4dfde3549ce5a7c5c63c
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Mon May 13 18:45:03 2013 +0530

    mm-video: Adjust 3 byte start code address, if multiple DMX entries found

    - Core is not able to decode bit stream, when three byte start code
      0X000001 is a part of consecutive NAL's provided in single ETB.
    - Start address of NAL entry in DMX should be moved one byte backward
      as video core skipping 0X0000 skipping in every NAL bit stream.

    Change-Id: Ia816175e7b821dcb30200a3bd934896efd3ea20f
    CRs-Fixed: 468664

commit 160aca304ad047c3c90892f105bb27309ebeb7ba
Author: Riaz Rahaman <riazr@codeaurora.org>
Date:   Wed Dec 26 12:12:25 2012 +0530

    mm-video: revert usage of flag GRALLOC_USAGE_PRIVATE_CP_BUFFER

    Obsolete the custom flag added to notify usage of secure buffers. Now all
    secure buffers are allocated based on the flag GRALLOC_USAGE_PROTECTED

    Change-Id: I92a87f402892d5758fa9adef8ae734d1b8be2c83

commit 5234181ec526471bdacadd876cc202b65c53035b
Author: Steve Kondik <shade@chemlab.org>
Date:   Tue Jun 18 20:16:41 2013 -0700

    Fix compilation issues.

     * Only build when TARGET_QCOM_MEDIA_VARIANT=caf
     * Update makefiles for media-caf path
     * Add ifdefs for QCOM_BSP features

commit d4f83efc62a7f2b3aba5f5464b49e8b00d6c6630
Merge: bf3eb97 523513e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 18 12:54:44 2013 -0700

    Merge "mm-video: add support for the bitstream_restrict flag in VUI"

commit bf3eb9776de1a913defcd1aeea798ed36247b998
Merge: 7b1eefd e47a623
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 10:43:03 2013 -0700

    Merge "mm-video: vdec: attach proper timestamps to delayed ETBs in EOS"

commit 7b1eefd8b20cfa9816ab608c8d84f57b07fa6552
Merge: 377cd8c c815f79
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 10:43:02 2013 -0700

    Merge "mm-video: Free frame_parser in component de-init"

commit 377cd8ce3bf35424c0c753c14b3254a68025fe4c
Merge: 7932142 c592f9e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 10:43:01 2013 -0700

    Merge "mm-video: vidc: Flush m_input_free_q when input buffers are freed"

commit 79321429f1899db4de887edee8c625c9bd8c67cb
Merge: ddc4ee2 2e306ed
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 10:43:00 2013 -0700

    Merge "mm-video: vidc: Handle EOS buffer with content correctly"

commit ddc4ee22408f208ecb57df4470414b64a29a842c
Merge: 5726035 c7c3f2a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 17 10:42:59 2013 -0700

    Merge "mm-video: Handle EOS and cleanup for opaque format."

commit e47a623773e52b10a9b9c356871c1e5677c34e27
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Jun 10 20:41:17 2013 +0530

    mm-video: vdec: attach proper timestamps to delayed ETBs in EOS

    When generating delayed ETBs in EOS case, attach the timestamps
    correctly for deferred frames.

    Change-Id: I475ea11fac9593cee2c25d2aa7910d5a9165105a

commit c815f79ed2749d16bc2a98c16a0b46b3bd358dc5
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jun 7 22:02:26 2013 +0530

    mm-video: Free frame_parser in component de-init

    frame_parser is alloc'ed in component init, it should be accordingly
    freed in de-init rather than when input buffers are freed.

    Change-Id: I19bb9899b7659eedb286fa5e44f0af901ae764b4

commit c592f9ea308bd19dbea89e934a56f87bf23d9de7
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jun 7 21:58:08 2013 +0530

    mm-video: vidc: Flush m_input_free_q when input buffers are freed

    Not flushing it might leave dangling pointers to old input buffers,
    which end up getting de-referenced, if the component is re-used for
    another session.

    Change-Id: If232cb3a5d10c4c1fd4634814cf25707fc7b8c90

commit 2e306edb957beab93c24cd92e83a2b57bd53d47a
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jun 7 22:08:40 2013 +0530

    mm-video: vidc: Handle EOS buffer with content correctly

    When EOS buffer with nFilledLen > 0 was queued, the component would
    apparent it the buffer before the EOS.  This resulted in a buffer with
    two frames to be queued to the decoder, which subsequently ignores the
    second frame.

    Fix this by queuing the contents the EOS buffer seperately instead of
    appending it.

    Change-Id: I198a7485c3bdf0e6181bfedbc0fa6ea91341475a

commit c7c3f2a2166a83c84697c7a0c78eb9def30ef7e9
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jun 7 22:11:51 2013 +0530

    mm-video: Handle EOS and cleanup for opaque format.

    Input buffers queued with fillen-length=0 can potentially contain
    invalid pBuffer. Skip color conversion for opaque format and pass
    an empty buffer to codec with an EOS marker for signalling EOS.
    Cleanup buffer-list when port buffers are freed to enable
    reallocation.

    Change-Id: I1890b882334a42e56ea8066399a76f0ba39d3c4c

commit a86473d0b01b101eaef55b015ed518ba836ca5d6
Merge: b9e9e48 ee30fca
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 11 07:58:33 2013 -0700

    Merge "mm-video: Get current performance level of video driver"

commit 5726035b0944c7cd4e0746a69e66b9752ca1e032
Merge: 62ce57c f4eac8b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jun 11 00:07:31 2013 -0700

    Merge "QCMetaData: Add support for CAN_SEEK_TO_ZERO in QC file"

commit 523513ed41b4f369991379329c835163423d4e38
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Jun 10 19:35:50 2013 +0530

    mm-video: add support for the bitstream_restrict flag in VUI

    Expose the OMX_QcomIndexParamEnableVUIStreamRestrictFlag parameter which
    allows the OMX client to enable bitstream_restriction_flag in the H264
    VUI.

    Change-Id: I60c81d1b76a712334af91e99497a5b5a30017440

commit ee30fcae5d0e1c18e8fd0cc24cfbfb1aee39971b
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri May 24 18:42:09 2013 +0530

    mm-video: Get current performance level of video driver

    Get current performance level of video driver. Client can
    use this info to decide whether to start another video
    session in parallel.

    Change-Id: Ia1ec49e8c0a3cb334f346248b4255614b5985446
    CRs-Fixed: 491232

    Conflicts:

    	mm-core/inc/OMX_QCOMExtns.h

commit f4eac8be9d0ee4a0f6516f6c42c9bb34651ccb29
Author: vivek mehta <mvivek@codeaurora.org>
Date:   Wed May 29 15:05:09 2013 -0700

    QCMetaData: Add support for CAN_SEEK_TO_ZERO in QC file

    - Add CAN_SEEK_TO_ZERO in QC file and remove it from AOSP file

    Change-Id: I9c82f95f70931413e88eebe9ae2ec28b14b8da37

commit b9e9e488f5fe578c551a4692efdec47359576e43
Merge: fcab07f 0affacc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:26:46 2013 -0700

    Merge "DashPlayer: Notify seek position to dash source"

commit fcab07f50a166f62c62cf850dbf3563555ca1ba4
Merge: 0b85163 30ab257
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:26:43 2013 -0700

    Merge "Fix for the flicker while changing the resolution in DashPlayer"

commit 0b8516330a17d6f7745489af0aea748fed97f0b6
Merge: 8f83aaa 0e97ae3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:26:40 2013 -0700

    Merge "DashCodec: keep cache of formats to support b2b format change"

commit 8f83aaac2fcca23a5065a7be493cf6aea0f38c4b
Merge: b07ed92 de198b6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 23:26:38 2013 -0700

    Merge "dashplayer: Fix green frame issue on session timeout"

commit b07ed92df3a1d8bbdb00e7bfac2fe39c82f8a01f
Merge: 0da8138 2033893
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jun 3 21:44:05 2013 -0700

    Merge "DashPlayer: Add support for dumpsys in DashPlayer"

commit 0da8138470963f3a11d7730d853e837f947736b2
Merge: db94834 e9cc88d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 31 09:40:21 2013 -0700

    Merge "mm-video: vdec: Allow client to set TURBO mode"

commit 0affacce0e24d7d30991d5019d9d951fdd45cd29
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu May 30 10:26:32 2013 +0530

    DashPlayer: Notify seek position to dash source

    Notify seek position to dash source to make sure that
    if text samples arrive before audio/video, the time
    out for sending text samples is not wrongly calculated.

    CRs-Fixed: 492376

    Change-Id: I952e474d92936532956c1d456b6ad1d554402405

commit 2033893e5b254c2c42831a1c3eb24b1a08e7dfa2
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Thu May 30 13:49:02 2013 +0530

    DashPlayer: Add support for dumpsys in DashPlayer

    Added functionality in DashPlayer to dump playback statistics to file.

    Change-Id: I0f95684f10db376731f622f06d17cc262480ecd3

commit db94834aa795f270358b29f909b80eb6e6446d19
Merge: f517d96 d8b1827
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 29 00:55:25 2013 -0700

    Merge "DashPlayer: Notify position for video EOS buffer immediately"

commit f517d9676c4b55ff20ef4f131fb7d56b05a74bcc
Merge: 8955875 70fa326
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 29 00:55:19 2013 -0700

    Merge "mm-video: Adjust 3 byte start code address, if multiple DMX entries found"

commit d8b18278d74aaac298c72e918b3311173fdde6a2
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Wed May 22 14:06:31 2013 +0530

    DashPlayer: Notify position for video EOS buffer immediately

    Notify current rendering position for video EOS buffer immediately,
    without waiting for 100ms between subsequent updates.

    CRs-Fixed: 489546
    Change-Id: I9a8f346a68ff5c333d96e5ae24980e0ed1b27903

commit 70fa3260b7f496ca8ac399458f69d4c85e2d2e05
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Mon May 13 18:45:03 2013 +0530

    mm-video: Adjust 3 byte start code address, if multiple DMX entries found

    - Core is not able to decode bit stream, when three byte start code
      0X000001 is a part of consecutive NAL's provided in single ETB.
    - Start address of NAL entry in DMX should be moved one byte backward
      as video core skipping 0X0000 skipping in every NAL bit stream.

    Change-Id: Ia816175e7b821dcb30200a3bd934896efd3ea20f
    CRs-Fixed: 468664

commit 30ab25784ccf58ef2ef35414df6f47a8509c599a
Author: huiyQuic <huiyQuic@codeaurora.org>
Date:   Mon Mar 18 18:02:41 2013 -0700

    Fix for the flicker while changing the resolution in DashPlayer

    - Just notify the message of MEDIA_SET_VIDEO_SIZE to JAVA Layer,
      while beginning to play the streaming.
    - After the streaming begin to play, don't notify this message,
      while changing the resolution or seek operation finished.
    - If we don't set video size,
      windowsmanager will adapt the dimension of the clip by itself.

    Change-Id: I6a79d13159cd9bf33e0f483c7e1b71690f071011

    CRs-fixed: 451993

commit 0e97ae3c0795ca7006050478557f4ab96c408528
Author: Eric (Quic <yinlokh@codeaurora.org>
Date:   Wed Apr 17 11:00:01 2013 -0700

    DashCodec: keep cache of formats to support b2b format change

         - when format change takes place too fast, it will pick up wrong
           format.
         - keep a cache of formats and only issue one sendFormatChange per
           crop change.
         - clear format cache when flushing

    Change-Id: Ib45f3c5ac7764b4dd1edc4ac6c6f11390c33c151
    CRs-Fixed: 475092

commit 89558758486387c560e718853e41379d3839a1da
Merge: abe384b 6b42b49
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat May 25 02:20:02 2013 -0700

    Merge "mm-video: vidc: Enable data corrupt flag for MPEG2 & VC1 only"

commit e9cc88d1c763654ef14e9eac53658407046c38af
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Feb 21 19:25:54 2013 +0530

    mm-video: vdec: Allow client to set TURBO mode

    - Allow client to set TURBO mode to video decoder.
    - TURBO mode will set the maximum supported
      perfomance level to video driver.
    - Based on frame drops due to delayed video frames
      client can set TURBO mode to video decoder when
      required.

    Change-Id: I9e9c7ad3ed0345b36358361b394e0b1d7ce5cf74

commit 6b42b492d6639785dd6e024ee618a4addee8c4a8
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu May 23 19:32:21 2013 +0530

    mm-video: vidc: Enable data corrupt flag for MPEG2 & VC1 only

    - Update output buffers with data corrupt flag when required
      for MPEG2 and VC1 decoders only.
    - Enable data corrupt flag irrespective of frame type if sync
      frame not received.
    - Do not set data corrupt flag at the start of the playback and
      set when seek operation is made and sync frame not received yet.

    Change-Id: I1b887a324909b8d2ad23c67fe0f4c7733f6d69f7

commit abe384b96a61c92aef5fcab256083730cdd996ed
Merge: d785dfb 6ee5088
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed May 22 02:59:40 2013 -0700

    Merge "mm-video: Add data corrupt flag on output buffers when required"

commit 62ce57ccd4a395877d389eed070f1251637c6497
Merge: 1f6160c 8d6d0e3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 21 12:23:23 2013 -0600

    Merge commit '8d6d0e3bcde4a6f7c934859a2591507ecf95f645' into HEAD

commit d785dfb5084eb158cc8d76b9a3a71abaf5d587d0
Merge: 8d6d0e3 9f2697c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 20 20:18:04 2013 -0700

    Merge "mm-video: vdec: Fix movie studio crash"

commit 9f2697c228c1df4a584ce6dcfbbdf34a47e40e89
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Thu May 16 19:19:21 2013 +0530

    mm-video: vdec: Fix movie studio crash

    This change updates crop information with latest data
    available with the driver.

    CRs-fixed: 487314
    Change-Id: I04a54a47b34442cf38695913f5a97eb5663e36da

commit 8d6d0e3bcde4a6f7c934859a2591507ecf95f645
Merge: 5c8a68e 7dc2b9a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 16 12:59:23 2013 -0700

    Merge "mm-video: vdec: Handle OMX_IndexConfigCommonOutputCrop in test app"

commit 7dc2b9a2a7a235d86515e139a9cb8ea3d780db12
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Tue May 14 17:39:37 2013 +0530

    mm-video: vdec: Handle OMX_IndexConfigCommonOutputCrop in test app

    If crop information is changed for output buffer in the middle
    of the playback, OMX component sends OMX_EventPortSettingsChanged
    event with second parameter as OMX_IndexConfigCommonOutputCrop.
    This change handles this parameter and differentiates it from
    actual port reconfiguration.

    CRs-fixed: 488532
    Change-Id: I1c07578b9ffb21ad2ca39d6b4133e9d0581e872c

commit 5c8a68ebd635f859f0852fb7e5e93ca7153d2a4d
Merge: e490702 0708cbc
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 16 00:01:10 2013 -0700

    Merge "mm-video: vdec: Suppress unnecessary event callbacks"

commit e490702f15579001d88d27196d7b58b9863549c1
Merge: 1b5df12 dc661af
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 16 00:00:05 2013 -0700

    Merge "mm-video: vdec: Add size and buffer info to platform private"

commit dc661af6496ccfbba33e00d96c653d197f5aa18c
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon May 6 12:07:06 2013 +0530

    mm-video: vdec: Add size and buffer info to platform private

    This change adds size and buffer pointer to the platform private
    structure which allows the client to mmap the buffer if required.

    Secondly, this change overwrites the driver extradata with
    OMX extradata when OMX_QcomIndexParamConcealMBMapExtraData
    is enabled by the client

    CRs-fixed: 472201
    Change-Id: Iee7e5dbddcbfae438778759a808a9bbef0fac40b

commit 1b5df1255ddbe365e2501833e2be806e00023ad7
Merge: abe35c2 55b2d1a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue May 14 08:51:20 2013 -0700

    Merge "QCTimedText: Avoid recycling parcel while parsing parcel"

commit 6ee50881782f07feb293c7892615fc6d110677e8
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Mon May 13 19:47:37 2013 +0530

    mm-video: Add data corrupt flag on output buffers when required

    - If non-IDR frames received after seek operation, corrupted YUV frames
      are displayed.
    - Add OMX_BUFFERFLAG_DATACORRUPT flag to each output buffer till
      OMX_BUFFERFLAG_SYNCFRAME received.
    - IL client can skip rendering, if DATACORRUPT flag observed.

    Change-Id: I9bad6635397a03a55fd602740cc520cb807cf701
    CRs-Fixed: 472798

commit 55b2d1a836adc2375594d150e8d8dc0acb578a38
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Wed May 8 10:14:30 2013 +0530

    QCTimedText: Avoid recycling parcel while parsing parcel

    Text sample parcels are obtained from global parcel pool
    and should be recycled only once in jni.

    CRs-Fixed: 436855

    Change-Id: I750e2163ed389d7aacc6e00da35a219c10d9de78

commit de198b6d96c5f3a99719df1427a7e41b96544d85
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Wed Apr 24 16:42:19 2013 +0530

    dashplayer: Fix green frame issue on session timeout

    * Avoid rendering video buffer which signals EOS as it does
      not contain valid video data.

    CRs-Fixed: 476333

    Change-Id: I10e3a0cb1e2dc9e1574d5e2b05f6339e868ac6fe

commit 0708cbcba9bba058b43368fdd995400fc89249a3
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Thu May 9 12:59:22 2013 +0530

    mm-video: vdec: Suppress unnecessary event callbacks

    When smooth streaming is enabled, component is trying to
    send an additional event callback to the client when
    crop information change is detected into the driver.
    This change suppresses that callback.

    Change-Id: I91bd2ebc0ad33605ace65e5de3d8f3e68a659f59

commit abe35c20429891bcf0a4e549213e07efd8f0c497
Merge: f001537 3e36959
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 6 14:49:14 2013 -0700

    Merge "dashplayer: Adjust buffer count for native window"

commit f00153786ac5f3fd30d6d4fb0c0b56d92194f942
Merge: 676175a 1bf495c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 6 14:49:10 2013 -0700

    Merge "DashPlayer: enable secure output buffers for drm use cases"

commit 676175adec66974bd99ee74c98c3c28edc51a842
Merge: 6b2f85d 6c9a549
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon May 6 14:47:52 2013 -0700

    Merge "mm-video: vdec: Convey crop information from driver to client"

commit 1f6160cd45734d3f48280ce8e99b19e9aa3cb38e
Merge: 2b18e0b 6b2f85d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri May 3 06:42:55 2013 -0600

    Merge commit '6b2f85d95afee532136492b7981b34cb5cca8935' into HEAD

commit 1bf495c09e1f04282aab9a4127df495fdc84a8c5
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Fri May 3 15:13:42 2013 +0530

    DashPlayer: enable secure output buffers for drm use cases

     - sets GRALLOC_USAGE_PROTECTED for output buffers if
       content is DRM

    Change-Id: Ib1bdab9e88dbac41aa336c906bbba897699a9402

commit 6b2f85d95afee532136492b7981b34cb5cca8935
Merge: a48bc3f 6d19b34
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu May 2 06:06:32 2013 -0700

    Merge "DashPlayer:call unregisterHandler in DashPlayer, avoid memory leak"

commit 6c9a549e5b3cccce67d18519f02df4aa22147f3c
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Apr 26 13:04:32 2013 +0530

    mm-video: vdec: Convey crop information from driver to client

    Crop information about uncompressed buffers need to be
    conveyed to client to appropriately select the region
    to display. This change takes care of this.

    Conflicts:

    	mm-video/vidc/vdec/src/omx_vdec.cpp

    Change-Id: I1ddd129753ad3f6464ea415ded0a61f3b7c9bad6

commit a48bc3f0a67dadf4ff01858d982e1ba994e61b47
Merge: 1f217f9 66103f1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 29 01:25:37 2013 -0700

    Merge "dashplayer: Fix seek bar jump during seek"

commit 1f217f96a6ecc30b226073ec525aba7c110c2cc5
Merge: 4e3f0d7 7d6eebf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Apr 28 22:26:32 2013 -0700

    Merge "mm-video: vidc: Set max resolution when smooth streaming enabled"

commit 3e36959f9226c30d0bec6007729a0c0648bce6d8
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Mon Apr 29 10:43:03 2013 +0530

    dashplayer: Adjust buffer count for native window

    When allocating buffers from native window, adjust the
    buffer count based on the minimum undequed buffer count,
    and allocate an extra buffer for smooth streaming.

    Change-Id: I72ad33872b68bb0bfe41fcb565d61b429f76b892

commit 4e3f0d76fa003c427724dff102ef97a77111fae1
Merge: c127c55 fa9e018
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 26 20:47:09 2013 -0700

    Merge "vidc: venc: Add support for setting QP range parameter"

commit c127c550dda05bc8a67423490abd495f9a3c997e
Merge: db3016f 62ba738
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Apr 26 20:47:02 2013 -0700

    Merge "mm-core: Add support for setting QP range parameter"

commit 7d6eebf1be060bcadfde7d2050478cc6bfafab19
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Aug 9 18:26:19 2012 +0530

    mm-video: vidc: Set max resolution when smooth streaming enabled

    - Set maximum supported resolution to video driver
      when smooth streaming enabled by client
    - Amend logging as appropriate.

    Change-Id: I5459df8e5f3ae7b53984dd56405243e7cd7839a1

commit db3016f57a1076741012f91cf74d85ec953454c6
Merge: 72ae194 c910afd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Apr 24 07:49:24 2013 -0700

    Merge "mm-video: Fix issue with port reconfiguration specific clip"

commit 72ae19438043bc060ed44fef0c19f434f5b9479e
Merge: 67db381 42df58d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Apr 23 12:18:25 2013 -0700

    Merge "mm-video: vidc: parse extradata in video component"

commit 67db3814c5416cd7de1f5f91b28e09ac46bcb00a
Merge: 34a7759 42df58d
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Apr 23 09:27:21 2013 -0700

    Merge "mm-video: vidc: parse extradata in video component"

commit fa9e0183bb8cfebf4419ef24e1720fb6909b12fe
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Mon Apr 22 15:40:09 2013 +0530

    vidc: venc: Add support for setting QP range parameter

    With this commit, support is added for setting
    min_qp and max_qp during the video encoder component
    initialization.

    Change-Id: Iccec40261ed42f060c6e7e20dc8f823a8198ee2a

commit 62ba7382f1baab9cb58059bdf37aed3bc6031055
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Mon Oct 8 15:02:39 2012 +0530

    mm-core: Add support for setting QP range parameter

    With this commit, support is added for setting
    min_qp and max_qp during the video encoder component
    initialization.

    Change-Id: Ib8e23021f6e9b3599b6296455768b01d5fbeadda

commit c910afdff2ff8d5244c6e50de9aeedade4c0946c
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Apr 19 18:42:40 2013 +0530

    mm-video: Fix issue with port reconfiguration specific clip

    This change fixes the issue of UI freeze during the
    playback of multiple resolution change specific clips
    through decoder test app.

    CRs-fixed: 476934
    Change-Id: Ia5572482073bd743b641319ee246cb483bc1917e

commit 2b18e0b2513131d7a7b345a0a3f28d35e2468846
Merge: 4671ea6 68c9b99
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Apr 17 12:31:33 2013 -0700

    Merge "media: Disable DashPlayer and libcdconverter for JB_MR2 bringup" into jb_2.5_pdk

commit 68c9b99a9ffd08994c02b940f26d611b4edcf006
Author: Aparna Mallavarapu <aparnam@codeaurora.org>
Date:   Sun Apr 14 22:05:29 2013 +0530

    media: Disable DashPlayer and libcdconverter for JB_MR2 bringup

    Change-Id: I96fdd59df28a874064a11adfa7cc314d9848bd48

commit 4671ea6f9e4eb8500de13b7e538ddd7296155350
Author: Shalaj Jain <shalajj@codeaurora.org>
Date:   Tue Mar 26 17:36:40 2013 -0700

    libc2dcolorconvert: Remove reserved param from kgsl_map_user_mem

    The reserved field is not needed and is only defined in bionic,
    removing it.

    Change-Id: I9844b8139d3125d0176efd93ab107643d715cf68

commit 42df58dccc89b532488b7752dafc0c25b8e9edad
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Wed Apr 17 16:39:35 2013 +0530

    mm-video: vidc: parse extradata in video component

    This change gets the extradata offset and length
    from kernel video driver and parses the extradata
    in user space video component. It also inserts the
    QCOM Filler extradata if required for encoder.

    Change-Id: I6ea61731e75ed4aee342fea8ecf9185f0f3341f4
    CRs-fixed: 471135

commit 66103f13ff319c6e2218cd76373c680c5994fe17
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Tue Apr 16 15:06:26 2013 +0530

    dashplayer: Fix seek bar jump during seek

    Fix to update current position with seek time.

    Change-Id: I3febf7a46f2c0a85fbbc36ec0898adc58ec2e2a9

commit 34a7759ba023caae8f1f899191d0a18fb4821be3
Merge: eae77fc 3ebd2c4
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Apr 1 10:04:20 2013 -0700

    Merge "mm-video: Handle input/output flush done events appropriately"

commit 3ebd2c4c962affd4974e4f5241741fab62b82931
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Mar 29 14:03:52 2013 +0530

    mm-video: Handle input/output flush done events appropriately

    The command queue has more priority than etb/ftb queues.
    Input/output flush done events from the video driver were
    inserted into command queue hence they were first sent to
    client though there are some empty_buffer_done/fill_buffer_done
    events pending in etb/ftb queues causing video failures in client.
    This change will fix the issue by inserting input/output flush
    done events into etb/ftb queues and hence they were sent to
    client after all empty_buffer_done/fill_buffer_done events
    were sent.

    Change-Id: I824aa42b965aba1b270b15f074a77d425d744a82
    CRs-fixed: 430214

commit eae77fcf9d314e68a5b2edcf1f2475421423c4e8
Merge: e38cc75 1fd423c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Mar 29 00:16:00 2013 -0700

    Merge "mm_video: vidc: Handle consecutive start code in demux table"

commit 1fd423cb8a862ff1fb2fae39fe120ff66fb83386
Author: Mohan Kumar Gubbihalli Lachma Naik <mgubbi@codeaurora.org>
Date:   Mon Jul 30 16:37:21 2012 -0700

    mm_video: vidc: Handle consecutive start code in demux table

    In case of consecutive start code in a frame, these changes shall
    eliminate the first occurance of the start code entry while
    constructing a demux table

    Change-Id: I12c679407b60aa7d3414414911659b38737d4814
    CRs-Fixed: 368116

commit e38cc753dc3a0e34c3287e5c3fa34c5585156147
Merge: 462171e f2473ff
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 20 06:34:01 2013 -0700

    Merge "mm-video: vidc: Close ION_IOC_MAP fd before closing ION device fd"

commit f2473fff1e257da25b5e06aec8401d692f45abe8
Author: Mohan Kumar Gubbihalli Lachma Naik <mgubbi@codeaurora.org>
Date:   Tue Jul 31 15:09:18 2012 -0700

    mm-video: vidc: Close ION_IOC_MAP fd before closing ION device fd

    Changes were made to free output buffer function where ION_IOC_MAP
    fd is closed before closing ION device fd.

    CRs-Fixed: 382450
    Change-Id: I1e567ebc7679f502822113e535f7070ca5b2aea5

commit 462171ed8e7d315691b8cdf13b02bf704e71a943
Merge: ca904de bfadb54
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 14 06:05:17 2013 -0700

    Merge "mm-video: Return correct value from extract_rbsp"

commit 6d19b34f40333cfc6f24e4716dbaf83fd2d6b895
Author: Naupada Dharmendra Patnaik <npatna@codeaurora.org>
Date:   Thu Mar 14 14:13:49 2013 +0530

    DashPlayer:call unregisterHandler in DashPlayer, avoid memory leak

    AHandler objects in mediaplayer registred with ALooper
    but did not call unregister at shutdown.

    Change-Id: If9140d30ace0423c8181a1a64707ddcdc448d525
    CRs-Fixed: 461906

commit bfadb54499e7072d76415aaf68adab0b7d3e99bf
Author: Shobhit Pandey <cshopan@codeaurora.org>
Date:   Mon Mar 4 17:34:11 2013 +0530

    mm-video: Return correct value from extract_rbsp

    Sometimes, extract_rbsp is returning a value of type
    uint32 while the actual return type is a bool.
    In such a scenario, last 8 bits of return value is
    interpreted as zero at the caller occasionally.
    This is resulting in playback issues in arbitrary
    bytes mode. Returning correct value fixes the issue.

    CRs-fixed: 458922
    Change-Id: Ie956338211486d5a9699cf6e7e8b8a2653ea1214

commit ca904dece7fd45571d56caa15f1c04978d57a4a0
Merge: 0a2cf85 1600603
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 13 03:41:18 2013 -0700

    Merge "mm-video: vidc: Suppress non-fatal error messages"

commit 0a2cf85edba7bd483b0b80f55d1a38584bfa9854
Merge: 6eb77e8 d5a973a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 13 03:41:15 2013 -0700

    Merge "vidc:venc: Reject changing number of B-frames dynamically"

commit 6eb77e8f4161a63fc29d4b64b5e5d97d3bf8aa96
Merge: 5db7e11 c159212
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 12 15:45:33 2013 -0700

    Merge "mm-video: vidc: allocate color conversion buffers as uncached"

commit 5db7e11b91b5aaffb9b2669e43ebe2cc768ea472
Merge: b9e0bb9 08eb38b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 12 11:15:50 2013 -0700

    Merge "QCTimedText: Avoid recycling parcel while parsing parcel"

commit b9e0bb9e34b4e6ec8ab3c10f9ac8590b12689e5d
Merge: 8514ee8 ab1f42b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 12 01:27:39 2013 -0700

    Merge "mm-video: vdec: Amend logic to send playback error"

commit 08eb38b049139d9ff3723f8c9d8f2be00c4478f5
Author: Riaz Rahaman <riazr@codeaurora.org>
Date:   Tue Mar 12 11:02:04 2013 +0530

    QCTimedText: Avoid recycling parcel while parsing parcel

    Text sample parcels are obtained from global parcel pool
    and should be recycled only once in jni.

    Change-Id: Ie8fd65da4cadfd846e5543da5b40eb78193e8d86

commit c1592126b2f2141f17922442dfff795302f503cc
Author: Praveen Chavan <pchava@codeaurora.org>
Date:   Mon Mar 11 17:53:31 2013 -0700

    mm-video: vidc: allocate color conversion buffers as uncached

    If the c2d buffers are allocated as cached, CPU may not read
    updated data written by c2d hardware. This would need an explicit
    invalidate.
    Or allocate these buffers as uncached to avoid this issue.
    CRs-Fixed: 460460

    Change-Id: I87e0ebf7105261b34edbff7b8778d7ed2b9ef391

commit 1600603fea69dbfb3f5af78115b5e3fe3dbb0d83
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Sat Mar 9 16:31:20 2013 +0530

    mm-video: vidc: Suppress non-fatal error messages

    These messages are non-fatal and appear frequently
    during the video session. Hence suppressing them.

    Change-Id: I6528c467cafe8fa409ea1217b7113b075ed28a2d
    CRs-Fixed: 389408

commit d5a973aa569ebd36d54c68c3d6f23c7f8ce3a65b
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Mon Mar 4 17:37:50 2013 +0530

    vidc:venc: Reject changing number of B-frames dynamically

    The number of B-frames is not expected to be changed
    at run time. The dynamic intra period settings are
    allowed to change the number of P-frames and not B-frames.
    This change will reject if number of B-frames is changed
    in dynamic intra period setting.

    Change-Id: I5c5c168270bdb49a1533d5ffc46ff811c714d21a
    CRs-fixed: 416057

commit 8514ee81d181db1642f61edb2991afef6cc08d9b
Merge: 502bf25 a59fb7e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Mar 7 23:07:08 2013 -0800

    Merge "dashplayer: Fix to avoid crash during back to back playback"

commit 502bf25b05b42726d7f1d2fd7feefcbfb6ac4a59
Merge: 4f1e077 41da192
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 6 22:45:32 2013 -0800

    Merge "mm-video: vdec: Notify display about the format of video playback"

commit 4f1e077df2555205e57d861b6d17b962a6aaad46
Merge: 003bb7d 5dce999
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Mar 6 13:35:37 2013 -0800

    Merge "mm-video: vdec: Remove genlock lib dependency"

commit 5dce999dae6d4848f8ab6ecce2cde6a451422724
Author: Shobhit Pandey <cshopan@codeaurora.org>
Date:   Wed Mar 6 14:46:15 2013 +0530

    mm-video: vdec: Remove genlock lib dependency

    With MR1 release, the use of genlock is deprecated.
    Remove genlock lib dependency from the makefile.

    CRs-fixed: 449736
    Change-Id: I4e1fd58a1b64d9e80da63d2b0ea752eaf03bc277

commit 003bb7dab2dbc2301c8b563718c96d2587f0d160
Merge: 4323d63 dde8bcd
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Mar 5 03:17:59 2013 -0800

    Merge "audio: add wmaLossLess decoder component"

commit ab1f42bd0cf7fd5d51eafb11198cff8a00adbfe2
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Mon Mar 4 19:38:21 2013 +0530

    mm-video: vdec: Amend logic to send playback error

    During playback of an erroneous clip or a clip with SPS/PPS
    occuring more than 288 times before the first IDR is queued,
    playback error was being reported. This was being done for
    non arbitrary bytes mode only. Now handle this case for all
    frame packing modes.

    Change-Id: I3b289eae61b9007355db98929cc542c140ae660c
    CRs-fixed: 458875

commit 41da192219a5326bdf28139e6e74104d018ff4ea
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Fri Mar 1 13:14:16 2013 +0530

    mm-video: vdec: Notify display about the format of video playback

    An H.264 clip may have SPS+PPS that indicates the clip is
    interlaced. However, the subsequent frame data may be
    progressive. In this case, display is not updated about the
    progressive content, it continues to display the video as
    if it was interlaced.
    With this change, we are now notifying display about the
    Interlace/Progressive format of video playback by calling
    setMetaData API for each buffer during handling of Interlace
    Extradata

    Change-Id: I0f3f11ba21ffc659b0a54c1494c2aa72fdd367a7
    CRs-Fixed: 406941

commit dde8bcdcfca549de74b5c12530694c06740c4e1e
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Thu Feb 28 14:18:54 2013 -0800

    audio: add wmaLossLess decoder component

    - Add OMX.qcom.audio.decoder.wmaLossLess to
      register table to support wmaLossLess format

    Change-Id: Ibb20268ccb55a54302ed7cfd8863141482f7242b
    CRs-Fixed: 457174

commit 4323d632138df8152aebb3454020ccf307523bcd
Merge: 2fe8931 068a1ce
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 27 06:22:17 2013 -0800

    Merge "mm-video: vdec: Add additional dependencies in make file"

commit 2fe8931841a8b2c45b492d167df710c778cbbabe
Merge: f1532cd f262710
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 27 04:29:12 2013 -0800

    Merge "dashplayer: Replace ACodec with DashCodec"

commit a59fb7e5fe8f6b5db9a21f20cdc347f2afba49e1
Author: Naupada Dharmendra Patnaik <npatna@codeaurora.org>
Date:   Wed Feb 27 15:32:55 2013 +0530

    dashplayer: Fix to avoid crash during back to back playback

    stop call on source added to avoid crash during back to
    back playback

    Change-Id: I5bcbac2ba1c131c4d0e322ecd876a1d1021cba9f
    CRs-Fixed: 450679

commit f1532cd5e69b31b8d4dec59210ad47eeaddef3b6
Merge: 4a32e77 5512d95
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Feb 25 15:19:20 2013 -0800

    Merge "mm-core: Add support to configure ISO or ARIB coefficients"

commit f2627106336f702ea317f8b5351393c9134ecbb9
Author: Shalaj Jain <shalajj@codeaurora.org>
Date:   Tue Jan 29 18:27:08 2013 -0800

    dashplayer: Replace ACodec with DashCodec

    - Enable smooth streaming.
    - Notify flush completed for all states except executing.
      This prevents crash on seek, when seekbar is dragged.

    Change-Id: I9cd15194002c93ce1a411aa4abbded9d13be5701

commit 068a1ce465965ab3aecc179f0c4401faab74ddc6
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Mon Feb 25 16:58:40 2013 +0530

    mm-video: vdec: Add additional dependencies in make file

    Compilation is failing if make is issued on video decoder
    shared library before compiling the kernel. Add kernel include
    files path from out folder to LOCAL_ADDITIONAL_DEPENDENCIES
    in the make file.

    Change-Id: I7575f29f7245b4a73422eb35dcebc3fa2255a99f
    CRs-fixed: 455015

commit 4a32e77ee4340a6fabd687cced7e63d9493974ef
Merge: 71b29e1 5a20858
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Feb 25 02:08:46 2013 -0800

    Merge "DashPlayer: Following fixes are added in DashPlayer"

commit 71b29e12f18938213fab357e4be2f8cb5b29bbc6
Merge: c648e5b fee8e6a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Feb 25 02:08:46 2013 -0800

    Merge "dashplayer: Memoryleak fix and fps calculation during buffering"

commit c648e5b5744d84cefb6e5750d998eb90cb1bbf87
Merge: e046014 8519534
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 22 17:57:20 2013 -0800

    Merge "mm-video: Fix coverity errors"

commit e04601481ecf71afb17f7766840f1900ab70de99
Merge: c4e8e17 91adb11
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 22 12:31:03 2013 -0800

    Merge "mm-video: venc: Add NV21 color format support"

commit c4e8e17c06b2e74953c85a91d1aeafc6eec12777
Merge: 01bf94f a7f5146
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 22 05:48:01 2013 -0800

    Merge "mm-video: vidc: Add support for Smooth streaming for secure mode playback."

commit 01bf94f90ec1c638a60e1b0802bc012426fc38af
Merge: 4f24c4a bf53603
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 22 05:48:01 2013 -0800

    Merge "mm-core: Add support for Smooth streaming for secure mode playback."

commit 5512d95882438ac9cf55822ed63954a6b025dc7c
Author: Amal Paul <amal@codeaurora.org>
Date:   Tue Feb 19 20:23:03 2013 -0800

    mm-core: Add support to configure ISO or ARIB coefficients

    - Add QCOM OMX extension to support configuration of ISO or
      ARIB stereo mixing coefficients.

    Change-Id: I6a969421184ccbe1af644ac4ed2395a8bb386d38

commit 4f24c4a964f40fa66998f7d0b570bd07aa131d03
Merge: 7a16b34 c87983a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Feb 20 10:08:03 2013 -0800

    Merge "mm-video: vdec: Remove genlock calls from userspace"

commit 5a20858dcfc0757f5b0b6956980f8bd424666d53
Author: Naupada Dharmendra Patnaik <npatna@codeaurora.org>
Date:   Fri Feb 8 10:27:26 2013 +0530

    DashPlayer: Following fixes are added in DashPlayer

     - Notify MEDIA_PREPARED after media duration is notified.
     - Not to notify Playback complete if Media Error is notified

    Change-Id: I94521f2ae4351fb3b89b021fc983d1d759f96986

commit 8519534c664f83304cf3a3e331a0ddc3cf38f7eb
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Tue Jan 22 17:20:12 2013 +0530

    mm-video: Fix coverity errors

    Fix for Out-of-bounds access(ARRAY_VS_SINGLETON) errors.
    These might have currupted or misinterpreted adjacent
    memory locations.

    Change-Id: I216c765da91d5c2c5ee96b8f1ab9e3bfd158c862
    CRs-fixed: 443336

commit 91adb11d09a260df0d17038fea6d2c504049b1ae
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Feb 14 15:37:40 2013 +0530

    mm-video: venc: Add NV21 color format support

    - This change adds NV21 color format for encoder
      input port.
    - Included kernel headers from kernel obj of the
      target out folder.

    Change-Id: Icfdb6c5e58d8d80610750985196eef5ad901ac1f
    CRs-fixed: 448511

commit a7f5146e02837f9e72458962a41b4264a5beff90
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Wed Feb 13 17:46:57 2013 +0530

    mm-video: vidc: Add support for Smooth streaming for secure mode playback.

        -When secure playback enabled, extra data parsing can't be done to
          find new resolution.
        -This change will add the extension index required for
          Smooth Streaming for both secure and non secure mode video playback.

    Change-Id: I65be81b9593879466d0398ff593e4b806db5f940
    CRs-Fixed: 451786

commit bf536031789cd2a5f5128be9e19645d0f5cf2870
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Wed Feb 13 18:32:07 2013 +0530

    mm-core: Add support for Smooth streaming for secure mode playback.

       - This change will add the extension index required for
       - Smooth Streaming for both secure and non secure mode video playback.

    Change-Id: I351b5c68702fc2dd83d50801b9bee7f8744c31b6
    CRs-Fixed: 451786

commit fee8e6aebc87b398f0c58491f3f9bf105662a398
Author: Naupada Dharmendra Patnaik <npatna@codeaurora.org>
Date:   Fri Feb 1 15:11:05 2013 +0530

    dashplayer: Memoryleak fix and fps calculation during buffering

    1. mTrackName was allocated with a new call but was never
       deleted, due to which there is a memory leak.
    2. Skip fps stats for accumulated frames after buffering as the
       buffering duration reduces the fps value.

    Change-Id: I26a67e8cc213294ea2fcc0c46a4d3c20ebe06419

commit 7a16b34ddc2ed1bf25afb9f3f2ccfec40939e6da
Merge: b8007ab 578b244
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Feb 12 06:36:07 2013 -0800

    Merge "mm-video: vdec: Separate meta buffers support in secure mode"

commit b8007ab74f17dc3c7dbc2b0acaa3a61552745eed
Merge: b4d445b f0d7e38
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sun Feb 10 20:47:07 2013 -0800

    Merge "mm-video: Fix component_init() failed use cases"

commit b4d445b7cc1b9ce16796430264deeab853bf8b58
Author: Duy Truong <dtruong@codeaurora.org>
Date:   Sun Feb 10 04:34:41 2013 -0800

    Update copyright to The Linux Foundation

    Change-Id: I1f956c6c43d9dd77583ba9f78e8e419865f16a9b

commit 079b47fc3118d3f4ed71808782ee975de01787c3
Merge: c27c650 ae7b692
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 8 17:56:42 2013 -0800

    Merge "mm-core: Add key for HFR encoding"

commit c27c650e77060b307f869223df152b8520ecd51d
Merge: e8916cf 798dba5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 8 15:06:53 2013 -0800

    Merge "Merge "mm-core: Add key for HFR encoding""

commit e8916cf546254c25d79dc927c7ee70fabd295dcf
Merge: b1e4356 ae7b692
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 8 15:06:53 2013 -0800

    Merge "mm-core: Add key for HFR encoding"

commit b1e4356b45912d319adf04b7b7fcfa407533063b
Merge: b730b07 76bab27
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 8 15:06:31 2013 -0800

    Merge "dashplayer: add text track support"

commit b730b07b8312421d524c05fdc284a1b4f76a9ab1
Merge: 798dba5 45993aa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 8 15:06:27 2013 -0800

    Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"

commit 798dba50bcb7c11d7ee98e8958da43752ec50790
Merge: 1439b74 ae7b692
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 8 13:35:33 2013 -0800

    Merge "mm-core: Add key for HFR encoding"

commit c87983a1771d7120dc59f4d75466426ed46241ca
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Thu Feb 7 14:01:50 2013 +0530

    mm-video: vdec: Remove genlock calls from userspace

    With MR1 release, the use of genlock is deprecated.
    Therefore, it should not be used anymore.

    CRs-fixed: 447716
    Change-Id: I89b0131d5e50380debbbfca6b54e1abd355d98a8

commit 1439b742bdc65ad28453d9b60e9d4a8d6b058d80
Merge: 4390a84 877d16b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Feb 7 04:55:46 2013 -0800

    Merge "mm-video: Fix API for getting supported profile and level"

commit 877d16bee566e3aed706cde25ab311f6cad4abd6
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Thu Jan 31 14:53:36 2013 +0530

    mm-video: Fix API for getting supported profile and level

    In get_supported_profile_level_for_1080p() function, if a
    query for codecs such as vc1, divx, divx4, etc. is made,
    it does not return an error message, instead it returns
    OMX_ErrorNone which results in an infinite loop at the
    function caller's side. Thus omx component deinit never
    happens and causes ANR.
    With this Fix, appropriate error message is sent to the
    caller.

    Change-Id: I128645bbdfec952973824d88a995ab0218246fa6
    CRs-fixed: 422083

commit 578b2449e68e9889cdff8bef5c309f60dbe25cd0
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Feb 4 12:18:35 2013 +0530

    mm-video: vdec: Separate meta buffers support in secure mode

    Extradata is appended at the end of the output buffer
    in the normal scenario. But in case of secure playback,
    we can not parse the input and output buffers,
    therefore extradata support is unavailable in this case.
    This change adds the extradata support in case of secure
    playback. For secure playback, extradata is now dumped
    in the separate meta buffers which are allocated from
    ION_CP_MFC_HEAP_ID that enables HLOS to read and parse it.

    Change-Id: Iba95f31d576c955068e8e12ae7745652c4b6d69f

commit 4390a849d554585751db044fc45d740f8aa9f19d
Merge: 83c4b41 67d7891
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 1 14:54:37 2013 -0800

    Merge "Revert "mm-video:vdec: Separate meta buffers support in secure mode""

commit 83c4b41507e952db349dc3d62b44237e9a477b9e
Merge: 91a79da c54b0c5
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Fri Feb 1 13:15:00 2013 -0800

    Merge "vidc: venc: Disable slice mode for unsupported settings"

commit ae7b692d7cf0c24f46c17ad51ef007a8ba4fbb6b
Author: vivek mehta <mvivek@codeaurora.org>
Date:   Tue Jan 22 10:39:39 2013 -0800

    mm-core: Add key for HFR encoding

    Change-Id: I0aa6978eaad25418260114fdad94d3294a0205c7

commit f0d7e38d83dddcd3a5220a76910b02965bb69535
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Wed Dec 19 20:00:11 2012 +0530

    mm-video: Fix component_init() failed use cases

    Video playback is failed if component_init() fails before
    message and async threads were created due to thread_join()
    function being called with out checking whether the threads
    were created. This commit will add check conditions to
    verify whether threads were created before calling
    thread_join() functions.
    This commit also moves the video driver closing function
    from comopnent_deinit() to destructor() after thread_join()
    functions as video driver needs to be closed after messsage
    and async threads were exited.

    Change-Id: Iffd56a0b6685ef08feae610f226fe9b81382b542
    CRs-fixed: 425160

    Conflicts:

    	mm-video/vidc/vdec/inc/omx_vdec.h
    	mm-video/vidc/vdec/src/omx_vdec.cpp

commit 67d7891cdc55a0ef755b5a4e6b2e989fc1764693
Author: Praveen Chavan <pchava@codeaurora.org>
Date:   Thu Jan 31 16:43:45 2013 -0800

    Revert "mm-video:vdec: Separate meta buffers support in secure mode"

    Handling extradata for secure mode should be enabled for specific
    targets and should be merged after corresponding TZ changes.

commit 91a79da0a7ae2f056362e77ab51e42f7a0dd66c7
Merge: 85ab05c fba49c6
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 29 16:54:49 2013 -0800

    Merge "mm-video:vdec: Separate meta buffers support in secure mode"

commit 85ab05c7a0ab4734888fe15edc3280748da200e2
Merge: 786eac9 9434492
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 29 16:54:38 2013 -0800

    Merge "mm-core: Add registry table for mpeg2 secure playback"

commit 786eac975c21a985b2bd66b1bc4dfc084ce9e2a2
Merge: cc3ef66 d05d8b1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Jan 29 16:54:12 2013 -0800

    Merge "mm-video: Build video test programs with 'debug' tag"

commit fba49c615b9e34af87db459c58e508b59eaf986a
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jan 25 12:26:22 2013 +0530

    mm-video:vdec: Separate meta buffers support in secure mode

    Extradata is appended at the end of the output buffer
    in the normal scenario. But in case of secure playback,
    we can not parse the input and output buffers,
    therefore extradata support is unavailable in this case.
    This change adds the extradata support in case of secure
    playback. For secure playback, extradata is now dumped
    in the separate meta buffers which are allocated from
    ION_CP_MFC_HEAP_ID that enables HLOS to read and parse it.

    Change-Id: I292a15abccfab666d5d319c629e2f9268b7ce5f4

    Conflicts:

    	mm-video/vidc/vdec/src/omx_vdec.cpp

commit 94344927417058af56bbcffb3bce070c1d7112d0
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Fri Jan 25 12:03:50 2013 +0530

    mm-core: Add registry table for mpeg2 secure playback

    During mpeg2 secure playback, the client calls the
    OMX_GetHandle method which locates the component
    specified by the component name,
    OMX.qcom.video.decoder.mpeg2.secure,and loads that
    component into the memory.
    This change adds the registry table for the above
    component name

    Change-Id: Ibdaa46c46f858904959c3a1b4cfc53ec9ee85373

commit cc3ef66fb81a014e7c65b9b966eb1c2b2819beaa
Merge: 57fc3e9 0730d4e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 28 03:25:46 2013 -0800

    Merge "mm-video: vidc: Broadcasts intent for the start and end of secure playback."

commit 57fc3e93decc1b28d5a57f8ce8c4f81cad5fa5c1
Merge: 4dc4945 f4f91d3
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 28 03:25:45 2013 -0800

    Merge "mm-video: vidc: Try to open secure video decoder again."

commit 4dc4945ca594dbc67c41972609f510dfe1d2a712
Merge: 1cf5e50 c77d08e
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Jan 26 11:17:21 2013 -0800

    Merge "audio: add support for amrwb/amrwb_plus"

commit 1cf5e50a668e392a65c0243ee09e763a5cdba787
Merge: 613757d fa5b0b2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 24 17:32:06 2013 -0800

    Merge "Merge commit 'android-4.2.1_r1' into Upgrade_branch"

commit c54b0c596c3fb1585859be984967d45d908c20a5
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Jan 24 18:03:28 2013 +0530

    vidc: venc: Disable slice mode for unsupported settings

    The video hardware does not support slice size less than
    1900 bits in BITS mode multi slice settings, so disable
    slice mode in case of unsupported multi slice settings.

    Change-Id: Iffbbb7c182b74c9de7f08db0dcade12783b8fbda
    CRs-fixed: 442639

commit 0730d4e80c8927619b8e13a6592f316cedce068c
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Thu Jan 24 16:48:58 2013 +0530

    mm-video: vidc: Broadcasts intent for the start and end of secure playback.

    - Broadcasts intent for start and end of secure playback so that other
      services (Wifi-Display) can find out whether secure or non-secure session
      is going on.

    Change-Id: Id69042bc449cae29a1dd309c9bfb477c3b005541
    CRs-Fixed: 444078

commit f4f91d30c1923fe39c76d3351415858fc8ac2f5b
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Wed Jan 23 12:12:18 2013 +0530

    mm-video: vidc: Try to open secure video decoder again.

    Try to open secure video decoder again if first
    open fails.

    Change-Id: I244970d3d804688b1c57635c1f6c2965f8ee4735
    CRs-Fixed: 444078

commit 613757ddfe4b83380f2e338e1a49c3151499140f
Merge: 432ff70 76bab27
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 23 21:11:43 2013 -0800

    Merge "dashplayer: add text track support"

commit 432ff70a7a83f235cd3a4f6b467bca944fbbd22f
Merge: ecdd147 45993aa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 23 21:11:40 2013 -0800

    Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"

commit ecdd147aa3527d48f9d0a8ee9a4c94095e7bec39
Merge: b927b97 76bab27
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 23 19:37:49 2013 -0800

    Merge "dashplayer: add text track support"

commit b927b974713d3c1f1b7d6c2592e93745913d3583
Merge: b6e3186 45993aa
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 23 19:37:36 2013 -0800

    Merge "qcmediaplayer: Add qcmediaplayer for supporting DASH"

commit b6e3186e78588d8bb204b465386a66f1398f0909
Merge: 68bbda4 d9443f8
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Jan 23 17:57:38 2013 -0800

    Merge "vidc: Amend output timestamp check condition"

commit d9443f8db3652ec27bcdb2f70538628dbc7490cf
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Tue Jan 22 21:03:40 2013 +0530

    vidc: Amend output timestamp check condition

    The output timestamp need to be checked after
    the timestamp reorder operation is completed,
    not before the reordering. This change will
    amend the check condition accordingly.

    Change-Id: Id6fbf714d485e5ecd1847ddaa4d2fa84fa211e28
    CRs-fixed: 441917

commit 76bab27854e59ed5864bcd365882ed995f71cbae
Author: Ajit Khare <ajitk@codeaurora.org>
Date:   Mon Jan 21 01:11:06 2013 -0800

    dashplayer: add text track support

    Change-Id: If4612dfca426efbbd9fb1b8afecbc077c3aed753

commit 45993aac00c0f3529406e5728d98a1c18bbfa2fe
Author: Ajit Khare <ajitk@codeaurora.org>
Date:   Mon Jan 14 16:19:10 2013 -0800

    qcmediaplayer: Add qcmediaplayer for supporting DASH

    Change-Id: I3431b91116504f22a1f53743983657954e80b43c

commit 68bbda49ff47d49ea086f29b1a41385551cc3f3a
Merge: b3063f7 fcd69b7
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 21 22:05:27 2013 -0800

    Merge "dashplayer: Add new player for supporting DASH"

commit b3063f73cae23732258247cbcdbd1a79e3a6c933
Merge: 8ff1b99 a07f77f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 21 22:05:27 2013 -0800

    Merge "mm-core: Add kKeySmoothStreaming"

commit fcd69b739e3e6efa96d237cf583e6e5c7174a769
Author: Ajit Khare <ajitk@codeaurora.org>
Date:   Mon Jan 7 23:28:47 2013 -0800

    dashplayer: Add new player for supporting DASH

    Change-Id: I23386f49298323cbf0aecddb7fee2016a2ec16f3

commit 8ff1b992581890e35ea18ead7c8a697dfbf7c793
Merge: 4046ee4 192c739
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 21 12:25:24 2013 -0800

    Merge "mm-video: msm_fb_unset and msm_fb_play should be followed by pan update."

commit a07f77f20e823bcf197e2be84d9d8f72a29961c1
Author: Ajit Khare <ajitk@codeaurora.org>
Date:   Fri Dec 21 11:57:15 2012 -0800

    mm-core: Add kKeySmoothStreaming

    Change-Id: I93036781cab1d81d8e22a626d61348b71203380b

commit 192c739a9b62bd72a80d03252f3ebe6485ead3f6
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Fri Jan 18 17:11:44 2013 +0530

    mm-video: msm_fb_unset and msm_fb_play should be followed by pan update.

    - If pan update not called, Video buffers are getting dropped in MDP.
    - MSMFB_OVERLAY_PLAY and MSMFB_OVERLAY_UNSET should be followed
      by FBIOPAN_DISPLAY.

    Change-Id: Ib572d09ec5ea8524ac05581ec1d70df090b4478b
    CRs-Fixed: 440176 415430

commit 4046ee4a49f9ab48ec01309e37ad268cb0f9fbe0
Merge: 955cba4 1ad646c
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 17 19:39:12 2013 -0800

    Merge "mm-video: Fix for debug log messages support"

commit fa5b0b2b08e13a90c5abfa9b372ea2e5af20aa31
Merge: 955cba4 7a716fd
Author: Shruthi Krishna <skrish@codeaurora.org>
Date:   Thu Jan 17 11:46:05 2013 -0800

    Merge commit 'android-4.2.1_r1' into Upgrade_branch

    * commit 'android-4.2.1_r1':
      libc2dcolorconvert: Add flag for RGBA8888 endianness correctness

commit d05d8b1164d9c143155e927652348842125fe212
Author: Maheshwar Ajja <majja@codeaurora.org>
Date:   Thu Jan 17 17:31:57 2013 +0530

    mm-video: Build video test programs with 'debug' tag

    Video test programs should be made available only in
    'userdebug' and 'eng' builds but not in 'user' builds.

    Change-Id: I58d12f42ad9843278ed2849bc4bb636b80aed583
    CRs-fixed: 416069

commit 1ad646cf4f21adce504d32a133945f8358012006
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Tue Jan 15 15:47:22 2013 +0530

    mm-video: Fix for debug log messages support

    Enabling/Disabling debug log messages is controlled
    by Android.mk file.
    This change fixes the redundancy of the code which was
    creating some issues for this support. Now the logs
    can be enabled/disabled using Android.mk

    Change-Id: I4d4990a112ae494eec133d21ff1127c39878d5f4
    CRs-Fixed: 440739

commit 955cba492fce7e6d01fc3afbb9eb65edaa6f7e37
Merge: 7ce8cc7 420b4bf
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:14 2013 -0800

    Merge "mm_video: vidc: Align input buffer size for vdec."

commit 7ce8cc737705ebb2da65023d0e50161d6ee0c568
Merge: 7f225b2 12920de
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:14 2013 -0800

    Merge "mm-core: Add support for display aspect ratio info."

commit 7f225b26b87d4eada4fbf080a793a86a3d34dcf1
Merge: 1b51762 ec54f3a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:13 2013 -0800

    Merge "mm-video: Add support for display aspect ratio info."

commit 1b51762078798a1b2eb1b4140386ceb47985ab4b
Merge: e43f4fd 4b9413f
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:12 2013 -0800

    Merge "mm-video: vidc: Add support for MPEG-2 sample aspect ratio."

commit e43f4fd9bb336989c0afb2760fea79137b0ab536
Merge: d484095 800440a
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:12 2013 -0800

    Merge "mm-video: vidc: Add PAR value extradata support for H264."

commit d484095514c8f0fb2e592aad5deeccf3d7e8d862
Merge: 248ac07 570ca52
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:11 2013 -0800

    Merge "mm-core: Add MPEG-2 extension and user data types."

commit 248ac070062b3037420afedd02eee7a480c361b9
Merge: 240cae0 c050b50
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Thu Jan 10 07:01:10 2013 -0800

    Merge "mm-video:vidc: Add the handling of MPEG-2 extension and user data."

commit c77d08e893214246517a38e0b7138dd4c724aaef
Author: Mingming Yin <mingming@codeaurora.org>
Date:   Wed Jan 9 23:38:05 2013 -0800

    audio: add support for amrwb/amrwb_plus

    Change-Id: Ic167fd8fc2af9517642ae4061e8740760007cf0d

commit 420b4bff8e965a2dec78e40abd8315f3a574d6e2
Author: Mohan Kumar Gubbihalli Lachma Naik <mgubbi@codeaurora.org>
Date:   Mon Jul 23 15:17:31 2012 -0700

    mm_video: vidc: Align input buffer size for vdec.

    1080p video core needs scratch space in the input buffers.
    This change will reduce the input buffer size exposed to client
    by scratch buffer requirements of video core.

    Change-Id: I56fde759a1c715cb204f5779114f2694f13eb6f7
    CRs-Fixed: 366808
    (cherry picked from commit b316d6fb49a05634aab369b796bc0d6ef9cee4ba)
    (cherry picked from commit 0fb4a5fcd15f6326cd488098ca3325788e883e27)

commit 12920de87fefe0bd1094ac8d3169005280141320
Author: Shobhit Pandey <cshopan@codeaurora.org>
Date:   Fri Dec 14 20:42:28 2012 +0530

    mm-core: Add support for display aspect ratio info.

    This change adds support for sending display aspect
    ratio information to the client from video component.

    Change-Id: I2d56ef92046572e1aaf334ec8ecdc3f959617434
    (cherry picked from commit 456643d21db5eb2655b8015db4ca27e20062b686)
    (cherry picked from commit 855e84347ea307aff74447f9e26c86624928f5d3)

commit ec54f3aa77bd25b08272a8fc74fe7adb4f33ef87
Author: Shobhit Pandey <cshopan@codeaurora.org>
Date:   Fri Dec 14 20:34:45 2012 +0530

    mm-video: Add support for display aspect ratio info.

    This change adds support for sending display aspect
    ratio information as part of frame info extradata
    to the client.

    Change-Id: I60a20faffe2f58b5720670373625b3299f9ed1fc
    (cherry picked from commit 3914b4dba71fa9ba1d30a069051d2de062abe804)

    Conflicts:

    	mm-video/vidc/vdec/test/omx_vdec_test.cpp

commit 4b9413f883ed6e2255bce12d83e5355a970468a9
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Fri Jan 4 12:26:54 2013 +0530

    mm-video: vidc: Add support for MPEG-2 sample aspect ratio.

    ISDB-T client requires sample aspect ratio (SAR) and it
    depends on the sequence display extension and display
    aspect ratio (DAR). This change calculates the SAR
    values as required by the client.

    Change-Id: Ib7e3d1cfb8aff3a9e33048197a95b1d266ed3658

    Conflicts:

    	mm-video/vidc/vdec/src/omx_vdec.cpp
    (cherry picked from commit 5bf5f6cff2e5674f4f4b2bb721fb4b89bbcc92c0)

commit 800440a2ed48593992e6c7df38070dbf27bac460
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Thu Aug 2 16:36:57 2012 +0530

    mm-video: vidc: Add PAR value extradata support for H264.

    Core gives aspect ratio information for H264 in a shared
    memory register. This change will fetch the value of the
    aspect ratio from the designated register and append this
    information to the frame_info extradata which can be used
    by the client.

    Change-Id: I8f7f29a4f70cb99049d8238101326f86b5901a6f
    (cherry picked from commit 428f393430cd4d0cec771cd12e0abf3f2a637f85)
    (cherry picked from commit abec80d1348940972dd6307f3e03beaba9198260)

commit 570ca526604010b3684e6b251fa7a3a97f5e0045
Author: Shobhit Pandey <cshopan@codeaurora.org>
Date:   Wed Aug 1 14:40:04 2012 +0530

    mm-core: Add MPEG-2 extension and user data types.

    With this commit, OMX_ExtraDataMP2ExtnData and
    OMX_ExtraDataMP2UserData eTypes are added to support
    MPEG-2 extra data types.

    Change-Id: Iffd6e216d9f6fdf30f6a99410c353a37bbe14dc7
    (cherry picked from commit 051cdcaae9d3d69440b2bc5053b0c11e4486a60a)

    Conflicts:

    	mm-core/inc/OMX_QCOMExtns.h
    (cherry picked from commit 63d30d6c955068efc11a1a77b91aba4b927a56b4)

commit c050b5022555f0507d3d66370c44e8dd545f281d
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Fri Jan 4 12:04:42 2013 +0530

    mm-video:vidc: Add the handling of MPEG-2 extension and user data.

    Handling of extension and user data returned by core is added
    to user space code. Now extension and user data is appended to
    YUV data along with other extra data and passed to client.

    Change-Id: I6735263633d1cd224ce332fb7801b08511676922
    (cherry picked from commit 5b126aeb3ab33e635090bef8254025590197da32)

commit 240cae05e9201de9e0441d1135627b43279c03df
Merge: 4625656 7dce647
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Jan 7 10:05:05 2013 -0800

    Merge "mm-video: Change kernel headers search path"

commit 7dce647c0668e7e305462ce3e67270bb7873906e
Author: Rajeshwar Kurapaty <rkurapat@codeaurora.org>
Date:   Mon Jan 7 16:58:56 2013 +0530

    mm-video: Change kernel headers search path

    Compilation is failing as user space component is
    using kernel header from bionic which is not up-to-date.
    Make changes to the make file to include kernel header
    from kernel obj of the target out folder.

    Change-Id: I1444c55f90999fb332e206a8229aff9eda215b8c

commit 462565681eb9ff8eb97331d0144af04787433abb
Merge: 80fddc1 b094822
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Dec 18 12:16:11 2012 -0800

    Merge "omx_vdec: default case for get profile levels"

commit b09482275fa95473266daf97b08a04ce44afbfaa
Author: Eric (Quic <yinlokh@codeaurora.org>
Date:   Tue Dec 18 11:02:07 2012 -0800

    omx_vdec: default case for get profile levels

     - return ERROR_NO_MORE by default if the name is not part of the
       ones containing profile level.
     - Otherwise QueryCodecs will go into infinite loop and leak memory

    Change-Id: I6d4b4dce6ea020cb72171518b87450232cf638d0

commit 80fddc17184c8d04e36b5ae15367d03c019ab1c5
Merge: 4795692 0c3c248
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Dec 17 17:35:41 2012 -0800

    Merge "mm-video: set ION_SECURE to flags instead of heap_mask during ion alloc."

commit 0c3c2487edf90dcc6321d36c4898feafb78a9dd3
Author: Arun Menon <menon@codeaurora.org>
Date:   Mon Oct 8 13:52:44 2012 -0700

    mm-video: set ION_SECURE to flags instead of heap_mask during
    ion alloc.

    Without this change secure playback will fail.

    Change-Id: I13dc44113a6752a9198346725e9b5155414446d5

commit 4795692f9b799265e5877ab595b26ed4d91c8342
Author: Gopikrishnaiah Anandan <agopik@codeaurora.org>
Date:   Thu Nov 8 12:06:49 2012 -0500

    mm-video: port heap mask change to ion.

    Change-Id: Ifcb1316b5c26d5a1d2d490d177140057b3e93e16

commit 47b6a6cfc33e9011bbf9a1630dc9eabfb659cbf0
Merge: 8965db1 62d7fc2
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Sat Dec 8 22:41:10 2012 -0800

    Merge "mm-core: remove duplicate color format enum"

commit 8965db1cf55a21e078fb4f7b57dbae5876878ca4
Author: Srinu Gorle <sgorle@codeaurora.org>
Date:   Fri Sep 21 12:04:48 2012 +0530

    mm-core: Adds support for encryption type request.

    Adds support for encryption type request.

    CRs-Fixed: 396778
    Change-Id: I980754aa33af705e79d2051fd6fea988318c8505
    (cherry picked from commit 0f0ec3a40d765901044327d21e7ee6d243e37e41)

commit 07d951ced6e8d36f9ffac7566298e168de4c79d1
Merge: 0345321 13af3b9
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Dec 5 23:43:14 2012 -0800

    Merge "DivxDrmDecrypt: Export the header\include file" into jb_2.5

commit 13af3b954f3e0e3ceda37a3dc4745a736c1f655f
Author: vivek mehta <mvivek@codeaurora.org>
Date:   Tue Nov 20 14:44:52 2012 -0800

    DivxDrmDecrypt: Export the header\include file

    - Export DivXDrmDecrypt.h which is needed by mm-parser
      for generating libDivxDrm
    - libDixDrm is needed to play encrypted divx DRM
      content

    Change-Id: I99b04f1a53c82166ca8d33b33528f1df23949d44
    (cherry picked from commit 0c7cee4259b58ea43cb38b3e1d11fb8279b46c36)

commit 0345321cf21d1c74d1201f0e1b8ab4e0bc053b9f
Author: vivek mehta <mvivek@codeaurora.org>
Date:   Wed Nov 28 16:30:27 2012 -0800

    mm-core: Add QC specific MetaData and MediaDefs

    - to integrate extened extractor with existing framework
      new QC specific MetaData and MediaDefs are required.
    - create new files to avoid changing stock MetaData and
      MediaDefs file

    Change-Id: If32e182337fa4be8b039367729ffa6cecefd8115

commit 62d7fc2d5072f6f65164d171bbb055bd4d57e327
Author: Eric (Quic <yinlokh@codeaurora.org>
Date:   Tue Nov 20 12:43:41 2012 -0800

    mm-core: remove duplicate color format enum

     - duplicate definition of OMX_QCOM_COLOR_FormatYVU420SemiPlanar
       exists in OMX_IVCommon.h

    Change-Id: I42afb2768c1b600ba6e2ba17267254f5d8c4b7de

commit 3a0f454d7fa0fa78a792c5f2414951f9aa7541d0
Merge: 3635183 62f3c8e
Author: Anh Nguyen <anguyen@codeaurora.org>
Date:   Fri Nov 9 16:21:46 2012 -0800

    Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into mybranch

    * remotes/quic/partner-android/jb-mr1-dev:
      chmod uga-x

commit 7a716fd8484d06fe5b193f82bf8920e0dc63f3cc
Merge: 62f3c8e 9b65cd6
Author: The Android Automerger <android-build@android.com>
Date:   Mon Oct 29 11:20:08 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 62f3c8efa800d9729e2ee46e6b81a8d92a08a379
Author: Iliyan Malchev <malchev@google.com>
Date:   Thu Oct 25 08:28:40 2012 -0700

    chmod uga-x

    find -type f -perm +111 -name \*.[ch]\* -exec chmod uga-x {} \;

    Bug: 7428209
    Change-Id: I4c92cefc5784a2576369885a926c023281fc390f
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 36351833f7b46461b8585c3c771b93d53fccf0f2
Merge: 40f34d8 e77c68a
Author: Shruthi Krishna <skrish@codeaurora.org>
Date:   Thu Oct 18 14:35:48 2012 -0700

    Merge remote-tracking branch 'remotes/quic/partner-android/jb-mr1-dev' into HEAD

    * remotes/quic/partner-android/jb-mr1-dev:
      vdec: Use proper message identifier during input flush
      mm-video: use only IOMMU heap for non-secure playback
      mm-video: vidc: Allow client to request inband video header
      mm-video: secure/unsecure display calls

commit 9b65cd6d1f3422a3ae9d64e7c26627663810c6c7
Merge: e77c68a f4a01b1
Author: The Android Automerger <android-build@android.com>
Date:   Tue Oct 16 06:59:36 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit e77c68a64ef47b33ae1ae6f5a45152420336b36a
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Fri Oct 12 20:48:54 2012 -0700

    vdec: Use proper message identifier during input flush

    - Use proper identifier to find message type before issuing a EBD during input
      port flush

    Bug: 7320914
    Bug: 7330240
    Change-Id: I5ea8568288c392b79f3d639adf37f3d8f0a8e03b
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit f4a01b1a30a367f8ca73467205e74701ea9c1391
Merge: bea3944 6798a13
Author: The Android Automerger <android-build@android.com>
Date:   Wed Oct 3 06:59:52 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit bea3944ef2e68e74f9b3a527a2da1d3f27132e1b
Merge: 3145f89 a370c15
Author: Iliyan Malchev <malchev@google.com>
Date:   Tue Oct 2 18:25:31 2012 -0700

    Merge "mm-video: use only IOMMU heap for non-secure playback" into jb-mr1-dev

commit a370c157f9ab6a5d4576820acd09dd4239879ffa
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Oct 2 11:57:04 2012 -0700

    mm-video: use only IOMMU heap for non-secure playback

    Change-Id: Iccd0f77b2204c175613b2b4bd4dddeb532a33769
    Signed-off-by: Praveen Chavan <pchava@codeaurora.org>

commit 3145f89c1398e32bb7fc6cc03866388f42d2bad3
Author: Deva Ramasubramanian <dramasub@codeaurora.org>
Date:   Thu Sep 27 17:01:46 2012 -0700

    mm-video: vidc: Allow client to request inband video header

    Expose OMX_QcomIndexParamInbandVideoHeader, which, if set, asks the
    encoder to generate the video header and prepend to each IDR frame.

    Change-Id: Ie2ad4b5d5cd1dce667620a053576bc573bd0ed2b

commit 6798a131ee3eaf6bcf039671a5bf1996b540aeeb
Merge: fcb1a02 804ba2c
Author: The Android Automerger <android-build@android.com>
Date:   Sun Sep 30 06:59:47 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit fcb1a02a7e154802e883bfdfde972e603f8a0a7c
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Fri Sep 21 17:50:42 2012 -0700

    mm-video: secure/unsecure display calls

    - In secure mode, call qService APIs to signal start and end
      of a secure session
    - This is to synchronize secure sessions with display sub-system

    Bug: 7029636
    Change-Id: I067d750ed43d942b795075e09998e9631738857f
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 804ba2ced8b812641f4eaf461274a41e1ab28519
Merge: 40f34d8 7aefb02
Author: The Android Automerger <android-build@android.com>
Date:   Tue Sep 25 07:00:00 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 40f34d83af63a67dfa16c98767e582c4a2b2fdec
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Wed Sep 19 15:31:48 2012 -0700

    mm-video: Add support for ouput buffers color conversion.

    Video decoder hardware generates YUV in tile format.
    Client of openmax video component can request for a different
    color format in allocate buffer model.

    Change-Id: Ic08a69421e0feab96fcd6c40ebde4019309a40a1

commit a01b803ceb4959ceac2cbed8e099653de546e169
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Fri Sep 21 14:36:58 2012 -0700

    colorconvert: YUV420 Planar support

    Change-Id: I9b7c434033baddab10e7c98efc1e401d7c94a531

commit 19afafb391255a960f9da204ea55b7d628688946
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Wed Sep 12 12:13:12 2012 -0700

    Add Tile4x2 support to color convertor

    Change-Id: I47c606e92ca7936e7691e93a28453bc87e7c98ab

commit 7aefb02974a09030cf459c5d645175bcbaa826d7
Merge: 2d1936c 3241b5a
Author: The Android Automerger <android-build@android.com>
Date:   Fri Sep 14 07:12:00 2012 -0700

    merge in jb-mr1-release history after reset to jb-mr1-dev

commit 2d1936c1b3a89f95bc155d306a76a3384797da00
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Thu Sep 13 17:40:44 2012 -0700

    libc2dcolorconvert: Avoid excessive logging

    Change-Id: I6f115f95f074018c61a9147a46e6ef6512bae0c1

commit 3241b5a52e2c2e5414446837a05241f55dc0d39d
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Sep 11 16:13:31 2012 -0700

    libc2dcolorconvert: Add flag for RGBA8888 endianness correctness

    - C2D API by default expects the alpha byte in RGBA8888 at the LSB
    - We add a flag requesting it to look for alpha at the MSB instead.

    Change-Id: I9761564bc5e1381624becd56ee06fd5822c47597

commit 35720aac7dffc8cf1a3c855b0aa29945f4e1b7d3
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Sep 11 16:13:31 2012 -0700

    libc2dcolorconvert: Add flag for RGBA8888 endianness correctness

    - C2D API by default expects the alpha byte in RGBA8888 at the LSB
    - We add a flag requesting it to look for alpha at the MSB instead.

    Change-Id: I9761564bc5e1381624becd56ee06fd5822c47597

commit 7783f07680c4e868295efbd0cf55a1622a106522
Author: Deva Ramasubramanian <dramasub@codeaurora.org>
Date:   Thu Sep 6 14:19:13 2012 -0700

    vidc: Support for secure encoding session.

    This change adds support for secure encoding session.
    All buffers in openmax component will allocated from the
    secure heap.

    Change-Id: Id0da4e2a6149c41b2101c52a8eb9486ade39bd1e
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 73da82aa62423ce365ee904e88b47338368d635a
Author: Deva Ramasubramanian <dramasub@codeaurora.org>
Date:   Thu Sep 6 14:24:49 2012 -0700

    mm-core: Support for secure encoder component.

    Adding support for avc secure encoder

    Change-Id: Id3df7ea8d49ad0be240fbfbb0d227e81ec9d60ed
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 2a914b33529b826083ff39ec764426680367b157
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Wed Sep 5 14:36:59 2012 -0700

    Buffer size calculation corrections for NV12_2K

    Change-Id: I15c0c004b52f244aa7cd70e9859dfd363b37cd85
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 45b5b3b17dc1ac1a1a68112e200af6887144b660
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Thu Sep 6 10:45:57 2012 -0700

    vidc: handle incorrect buffer size from c2d.

    Video component will check for buffer size that the C2D component
    returns after color conversion. Any error in buffer size will be
    reported to client and session will be terminated.

    Change-Id: I8f54c095b3d16e2089fbfa1be22b6ef9a0827ff4
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 2fd0565a057f63bff8abca2a4a5ce2a77a004fe8
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Sep 4 14:07:23 2012 -0700

    mm-video: venc: Align the buffer size to 4K for ION memory.

    Before this change, the buffer size alignment was missing if
    the frame width or frame height were not multiple of 16.

    Change-Id: Ic868cb0e093fcf093c351e7e65c80de983539030

commit 7eecc360a0b15aec6389c96ec23980231af4ddc6
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Fri Aug 24 15:57:18 2012 -0700

    vidc: venc: Support for RGB888A input format.

    Adding support for RGB888A as input format for video
    encoding by integrating color conversion library.

    Change-Id: I771294efc8601eff9c3e13f251686697634f2f17

commit 484f1df7f1e765c66ca73f37511a0ad090820b74
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Fri Aug 24 15:09:25 2012 -0700

    libc2dcolorconvert: New API and color format support

    - Add an API to query for buffer requirements
    - Add an API to dump the converted output buffer
    - Add support for NV12 color format

    Change-Id: Ic958731752fda09bc2bc96472c9345e9653c2c6f

commit c124ee03788d734aba7b4d79d8ee5e45a3ece26c
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Fri Aug 24 15:09:09 2012 -0700

    libc2dcolorconvert: Initial commit

commit edbb785486ef8a0bbff7c0ea60c374149df9ab7c
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Aug 14 17:03:19 2012 -0700

    mm-video: venc: Fix enumeration of color formats

    Video encoder component should return OMX_ErrorNoMore,
    when nIndex is greater than the color format enumeration
    count.

    Change-Id: I8e0c6864e5b8f948246cd407cae828e93795917a
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 058dcdbfe54a3294a2713ba9993e6024f3f3a6a0
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Aug 14 15:44:37 2012 -0700

    mm-video: vidc: Revert optimization to skip few initialization steps for QCIF

    - As the OMX IL component is initialized with the default resolution for
      QCIF, many steps were skipped in the implementation of OMX_SetParameter
      with index OMX_IndexParamPortDefinition if the client sets QCIF as the
      encode resolution.
    - This causes issues with some IL clients (e.g. OMXCodec) which tries to update
      the port buffer size.
    - To be safe, do all initialization steps irrespective of resolution.

    Change-Id: I7c42e9ec6ede4a0b40242599e9119fa7a5eccc00

commit 120b7e44bc2419b5f9f03bc2af39c92d134189b7
Author: Ajay Dudani <adudani@codeaurora.org>
Date:   Thu Aug 16 22:16:07 2012 -0700

    mm-video: vidc: Map encoder input buffer aligned to 16

    The video core requires the encoder input buffer size to be
    calculated after aligning the height and width to 16.

    Change-Id: Ica04d82cd58e859f69fdbb32565bd9276c858d0c

commit e1b75ccf790ae63be6a99f617a1927d1e003cac9
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Jul 17 12:55:37 2012 -0700

    mm-video: Enable use of O_DSYNC flag

    - Enable use of O_DSYNC flag for secure video playback
    - Enable use of O_DSYNC flag for allocating uncached i/o buffers

    Change-Id: Iab9bd0d9d986934d439d1a44d1d846e858e0d3cf

commit 278952ff92fab2da0c47b912daeb662130676be1
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Wed Jul 18 14:00:24 2012 -0700

    mm-video: Use msm ion header file

    Change-Id: I08f000d5f471f6a6a1f4ba80a54d0b2cf9e666d0

commit edf642ef561acbcba2dc54e5033d89939d470eb5
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Thu Jul 19 16:00:04 2012 -0700

    mm-video: vdec: Fix calculation of pBuffer pointer for extradata processing

    - When graphic buffers are being used, the output buffer-header
      pBuffer points to the native buffer handle.
    - So lookup at the driver context array for the actual buffer address

    Change-Id: I47d34328b6f57d70f927ceedeedb7ac7aa4a9e51

commit 3d672d398c2d0e87cc3016ba0236c08f580f7d3a
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Thu Jul 19 15:58:17 2012 -0700

    mm-video: vdec: Check size of native output buffer

    - Add check to ensure size of native output buffer is
      alteast the size requested by the driver

    Change-Id: I851244b433a00a748f25f3209be9f8c5222507cb

commit 57d7e714e312fb07af793075526ba2ed83db0d9b
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Thu Jul 12 14:44:14 2012 -0700

    Fix dlsym call to get OMX_Deinit reference

    Change-Id: I7c8b4608e5d0eb98014966e18d8a7d6f74671e57

commit b88cb6921518253c26b91aa4db1eb1a96cf80577
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Mon Jul 9 19:23:03 2012 -0700

    venc : Reduce input port default buffer count

    - For metadata mode, reduce the default buffer count
      to 4.
    - Metadata mode currently has no way to signal the number
      of buffers prior to start of recording. This in turn means
      for a input source with finite buffers, we might end up having
      a larger buffer count than the source.

    Change-Id: Ic43e233d90e0ddf0779aba8f41d07c5bfa3d7423

commit a12f5a323f837ffe220c67110cce5f8f5d4df86f
Author: Iliyan Malchev <malchev@google.com>
Date:   Fri Jun 29 16:55:29 2012 -0700

    hardware/qcom/media: fix build for other targets

    Change-Id: I0a3890c88516f71b67a333051c503f37cc93741e
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 8af8fd0332901640133a87d9426c9574c03d05c0
Author: Haynes Mathew George <hgeorge@codeaurora.org>
Date:   Tue Jun 26 13:06:36 2012 -0700

    Fix compilation of media modules from build root

    Change-Id: I33c2666de541409e91bcf58964db28e247017a60

commit 826ececcbea342f7a0b92ec61847f1c95d384e05
Author: Iliyan Malchev <malchev@google.com>
Date:   Thu Jun 21 16:19:10 2012 -0700

    qcom/media: update media code

    Change-Id: I8fab90e0696562b21b22143d3357d518cad6d8cc
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit bac93072368cffe559a5621f32e6549e77ffc9cf
Merge: 3d528de 924fa42
Author: Mike Lockwood <lockwood@google.com>
Date:   Tue Apr 3 10:48:01 2012 -0700

    Merge remote-tracking branch 'goog/ics-aah'

commit 3d528deb37f16eab7d699ec8e7f60d34141a6316
Author: James Dong <jdong@google.com>
Date:   Mon Mar 12 14:15:02 2012 -0700

    Switched to use header files from /frameworks/native

    o related-to-bug: 6044887

    Change-Id: Ia3844f542da812594c4eb657106bec57c396352c

commit 6c5d832a6967e45bf742e1e612328d0fdccb3031
Author: James Dong <jdong@google.com>
Date:   Wed Feb 8 14:20:26 2012 -0800

    Don't use MediaDebug in libstagefrighthw

    Change-Id: I61b0911e79e11f9d4d27a867fc86462034171f1b

commit 6de494aa87e55850f2bfba52305e426a83686b40
Author: Steve Block <steveblock@google.com>
Date:   Sun Jan 8 10:17:55 2012 +0000

    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: I8e8018a5a04f51b276fb3b62ac2d9d15101fc0d8

commit 31f453ab7bb48bbfc6affd0772a76d785819c6c7
Author: Steve Block <steveblock@google.com>
Date:   Wed Jan 4 20:07:15 2012 +0000

    Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE

    See https://android-git.corp.google.com/g/156801

    Bug: 5449033
    Change-Id: I897aac93e9acf658be04c9d742cc1a212f6b8f40

commit 924fa42d6dc7534a48e8fb620e848087626dc92e
Merge: f1f18b0 05af514
Author: Ed Heyl <ed@google.com>
Date:   Fri Oct 28 19:05:54 2011 +0000

    keep previous history after reset to mr1 plus aah changes (ics-aah-wip)

commit 05af514975e4434ce8e6f2f2a4e38ab4069c26d6
Merge: 3be2b50 f5b9fc7
Author: Ed Heyl <ed@google.com>
Date:   Wed Oct 26 21:53:25 2011 +0000

    undo reset to ics-mr1 until we have a better method

commit f5b9fc72909fc6bd29f02c630f8eb45e02995b22
Merge: f1f18b0 3be2b50
Author: Ed Heyl <ed@google.com>
Date:   Wed Oct 26 18:50:22 2011 +0000

    reset to ics-mr1, but keep history

commit 3be2b50857dae22879ad961b33e659955204850b
Merge: f1f18b0 c937e73
Author: Steve Block <steveblock@google.com>
Date:   Wed Oct 26 04:48:28 2011 -0700

    am c937e739: (-s ours) Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

    * commit 'c937e739c0f822733bccb51c98a44b6b8c7bc663':
      Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

commit c937e739c0f822733bccb51c98a44b6b8c7bc663
Author: Steve Block <steveblock@google.com>
Date:   Thu Oct 20 11:56:19 2011 +0100

    Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE

    See https://android-git.corp.google.com/g/#/c/143865

    Bug: 5449033
    Change-Id: I8da16edc059df9a4abbae375ffcaa9c7458aa4b9

commit f1f18b0b5aadb0aeb23906ad3a854d6edc62dda7
Author: Mathias Agopian <mathias@google.com>
Date:   Fri Mar 25 18:48:19 2011 -0700

    remove unneeded library dependency

    Change-Id: Ic4aceac3d458e9d9957c40d8119326fe4daf862d

commit d191690a794e3a40b959cf840ba9a18b9e6e03c8
Author: Iliyan Malchev <malchev@google.com>
Date:   Mon Mar 14 14:02:16 2011 -0700

    hardware/qcom/media: remove LOCAL_PRELINK_MODULE

    Change-Id: I6527096e5e8c63c976187feef3e56d79d71cc3f5
    Signed-off-by: Iliyan Malchev <malchev@google.com>

commit 1910094a3149a0e72d74f83077f636d91e334cc9
Author: Andreas Huber <andih@google.com>
Date:   Tue Nov 16 12:46:53 2010 -0800

    Remove legacy renderers.

    Change-Id: Idb8650aad6e29ef993fea63c40b2459170bb0773

commit 55d33855cebb0f3d777c5ba9273d3ed5eed20ec9
Merge: 2b5d461 36fb588
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Mon Oct 18 08:21:14 2010 -0700

    Merge 36fb5888 from gingerbread-plus-aosp

    Change-Id: I1c711b620db3be76552cb531d415bc4e84dc7d77

commit 36fb5888a17a2d1ca69c7c2e2d378127f354153b
Author: Andreas Huber <andih@google.com>
Date:   Fri Oct 15 13:32:44 2010 -0700

    Include the framework copy of the OpenMAX headers instead of referencing external/opencore.

    Change-Id: I280792ba0a0a265e8dbbf712f6402c76818b5185
    related-to-bug: 3101573

commit 2b5d4610fa6506f95e9574900997793e35ebf9d8
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Fri Aug 13 15:50:38 2010 -0700

    Add CleanSpec.mk

    Change-Id: I31f390eb59cba4e7deb2ec680ec6ce88777afb05

commit 6d205a852bd0e35fbc1070c36b821ba3e9e23a4b
Author: Andreas Huber <andih@google.com>
Date:   Wed Jun 30 10:35:34 2010 -0700

    Support for hardware rendering in libstagefrighthw. Virtually identical to the other qcom platforms.

    Change-Id: I31e0e0356f50948fdefbdd95da7531fb29a4a155

commit 5d9d41d3f964e47886a87435b841def04418f5a8
Author: Andreas Huber <andih@google.com>
Date:   Tue Jun 29 10:54:10 2010 -0700

    Add libstagefrighthw for stagefright-OMX integration.

    Change-Id: I13e173c94a3df031fde29d9f82c28bcf18b246a1

commit 30a73034f38ba1cf31de98ce2560109ce6e535a6
Author: Nick Pelly <npelly@google.com>
Date:   Mon Jun 28 13:56:02 2010 -0700

    Use /dev/pmem_adsp again, but keep O_SYNC turned on.

    Change-Id: I2d4ae25766a9792d371386947b7b7f03ab2482e9

commit d31c34204bae71982ed9e5425cb110ebcb176f45
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 17:52:48 2010 -0700

    Use /dev/pmem with O_SYNC instead of /dev/pmem_adsp.

    (we might switch back to /dev/pmem_adsp once it exists).

    Also turn on some debugging.

    Change-Id: I99eb9d3944276eb6d82ab5749e1098def1e2d61d

commit 1236b8e0864893518dd98d83a7d7187ad814caf5
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 15:38:49 2010 -0700

    Move omx/mm-video and omx/mm-core into root.

    One less directory. I don't think we need this one.

    Change-Id: I82e3550608d4c4cac893a9faa7e8d94d63359f9d

commit 090b8e2b897c4f59d0bbafe983390c2e22c972fe
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 14:12:47 2010 -0700

    Fix Android.mk and compiler warnings.

    I removed dozens of warnings, and then gave up - there are dozens more.

    Change-Id: I7385ae73eac9d07654016a20de6b69d37c867463

commit 47e37c4428509524ee576920a98381f3e4872493
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 14:09:54 2010 -0700

    dos2unix everything and remove unnecessary files.

    Change-Id: I47ccf725e84c1129718915ad6531244588db2c91

commit e7273837b521d16f87dd5fb6eea3750a51ea92da
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 14:15:36 2010 -0700

    Add mm-video from codeaurora.

    Imported from codeaurora with no changes - does not compile.

    Source: git://codeaurora.org/platform/vendor/qcom-opensource/omx/mm-video.git
    branch: eclair
    sha1: 5ff99d2db47c7a2e07f8803e8d1a0485c5cb9e32

    Change-Id: Ic9e6711677888b1232b7c57fc82b2edeba36a553

commit dcbe497a7b22a4e1e52189ea70bf75227f55aa8e
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 14:03:41 2010 -0700

    Add mm-core from codeaurora.

    Imported from codeaurora with no changes - does not compile.

    Source: git://codeaurora.org/platform/vendor/qcom-opensource/omx/mm-core.git
    branch: eclair
    sha1: eeb6809d2a529acc92137f38a8cde258e6c7d1b1

    Change-Id: I53f85b440306cd6cb8cc172e8da38685192e0f4f

commit 09e019f0d07f42af25a2eb382e2e210a6cc9f308
Author: Nick Pelly <npelly@google.com>
Date:   Wed Jun 23 15:53:03 2010 -0700

    Add empty Android.mk so nothing gets built yet.

    Change-Id: I472390e1f7b08ba4619916a278b8e430fee7c8ae

commit 72c8c9f7d7f2f371e95918211e2bc514c96b9f83
Author: Nico Sallembien <nsallembien@google.com>
Date:   Tue Jun 22 14:43:33 2010 -0700

    new project, first commit

Change-Id: I07a02f65bf333e1f49081c8c68b66137e25bb1ea
Signed-off-by: huangqiwu <huangqiwu@xiaomi.com>
mm-core: Remove double declaration of OMX.qcom.audio.decoder.aac

Change-Id: I0d64cde98ab92c48fe9e70d26724c334f22a79f6
mm-video: vdec: ref count the notifications to secure-display

Notifications to display HAL to secure/unsecure display is sent
when component is created/destroyed. When multiple instances
are created/destroyed, the shared flag which indicates status
of such notification can go out-of-sync.
This change ref-counts the secure status flag and protects it
with a lock.

Change-Id: I126c92d16b03819afcbaf2f056928ba792556ed8
mm-video: vidc: Fix an issue in flush for Surfacemediasource_test

When i/p flush is in progress, need to give back all the ETB's
to client as EBD's directly instead of post_event. so do not call
push_input_buffer function.

Change-Id: Id17a84e9a009bbe80ec034c78a78a08b889c394a
CRs-Fixed: 517599
dashplayer: Remove cached formats from the proper location

1. Removed cached format/crop from the 0th position.
2. Clear cached formats in destructor.

Change-Id: Idd9c767bf9f660fe8ceae7f99b3ac51861b2a932
mm-video: vidc: Add support for dynamic debug logging

- Add system property for setting the debug level
- Add common macros for vdec, venc for debug logs

debug_level -> 1:ERROR 2:HIGH 4:LOW 0:NOlogs 7:AllLogs
adb shell setprop vidc.debug.level <debug level>

CRs-fixed: 546533
Change-Id: Icc0e6419dc7d740ca92abe7bc921381b31c7d2d3
media: compilation fix for updated sdk version

compilation fix for updated sdk version

Change-Id: Ib83de1d7ce4c8dae012ae0d0f22d7edccc8cc552
use the MetadataBufferType defined in frameworks/native

Change-Id: Ifb56622b7d0464e683882ef5b7c89e6dc5c8a097
Signed-off-by: Lajos Molnar <lajos@google.com>
camera bringup changes hardware-qcom-media

Change-Id: I4b81d2150e5bbd97d09c91f3cf89a8c6169b6058

Conflicts:
	libstagefrighthw/QComOMXMetadata.h
merge from caf

N/A

Change-Id: I969f5527449add8911997a27ca547a60e93eb271
Signed-off-by: huangqiwu <huangqiwu@xiaomi.com>
Remove AOSP reference to utils.mk

Remove function calls from AOSP code to utils.mk
& replace them with actual definition.

Change-Id: I5f9bee27521c39caab17b473059729800e55314e
CRs-fixed: 566287
dashplayer: Add support for invoke

Add support for  invoke() in dashplayer and QCMediaPlayer

Change-Id: I58ac0da2a9cd067d2ef92084b9c4c503786edb2c
dashplayer: Handle error for text track

Handle UNKNOWN_ERROR for text track

Change-Id: Ifeb827b4b7f0fb796593789b0b51be333292c66f
Merge branch 'android-4.4' of github.com:mitwo-dev/platform_hardware_qcom_media