Squashed commit of the following:

commit f5f5fcb245e8c29cdad15b1dcb9a1ea56dad9a09
Merge: 243f144 b345e18
Author: Steve Kondik <shade@chemlab.org>
Date:   Thu Oct 3 22:16:18 2013 -0700

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

commit 243f144d202d7533a1a3830e56f1fcab927a1a95
Author: Rudolf Tammekivi <rtammekivi@gmail.com>
Date:   Tue Aug 20 10:59:47 2013 +0300

    mm-video: Fix compile error on 7x30.

    Change-Id: Ia5d25165602eb2ae42ea8ac33248c627b07fed1d

commit b345e1824c85bc079b9318c98f14cd0f1df56caa
Merge: d77cc7c 4129054
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Mon Sep 23 02:12:07 2013 -0700

    Merge "mm-video: vidc: Add support for dynamic debug logging"

commit 4129054ff17269d3a4a277398b922f4a18c73cd4
Author: Deepak Verma <dverma@codeaurora.org>
Date:   Mon Sep 16 19:12:00 2013 +0530

    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

commit d77cc7c32f3ee3f30b65e383590bb83c15b47c45
Merge: 4fe81c5 5cb87c1
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Wed Sep 11 06:14:01 2013 -0700

    Merge "dashplayer: Remove cached formats from the proper location"

commit 4fe81c5ee201e739f05ea2a5d9561a5fe0f92f5a
Merge: f15822e bdff120
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Sep 10 06:44:35 2013 -0700

    Merge "mm-video: vidc: Fix an issue in flush for Surfacemediasource_test"

commit f15822ea41d67a547ed537b7061276e44ffe5c20
Merge: 2e97ad8 076081b
Author: Linux Build Service Account <lnxbuild@localhost>
Date:   Tue Sep 10 06:44:27 2013 -0700

    Merge "mm-video: vdec: ref count the notifications to secure-display"

commit bdff1208e41eed64285dbd60625129dab01289d5
Author: Pachika, Vikas Reddy <vpachi@codeaurora.org>
Date:   Wed Aug 21 11:36:21 2013 +0530

    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

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 076081beb2ed0b523cbf4ac0dd6bb2f929a32547
Author: Praveen Chavan <pchavan@codeaurora.org>
Date:   Mon Aug 26 15:47:38 2013 -0700

    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

commit 5cb87c125b46dd2e0183e08ad2cec7c832fd9b60
Author: Surajit Podder <spodder@codeaurora.org>
Date:   Mon Aug 5 15:43:22 2013 +0530

    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

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

Change-Id: Ib72b06d1905df70e1bd92ef4bf9f6f39ab039aa8