From 554ec0576432194f050191bdf248a1462d542a6d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 27 Aug 2013 19:21:17 +0200
Subject: GLMediaPlayer: Add camera input / FFMPEG: Fix 'av_packet' leak and
 add missing symbol 'av_realloc'.

- Add camera input
  - Use URI w/ scheme 'camera' to determine camera input is desired,
    use URI host as camera id.
    E.g. 'camera://0' for 1st camera.

  - AndroidGLMediaPlayerAPI14: Via 'Camera'

  - FFMPEG*: Via libavdevice, device name and input format

  - TODO: Add controls to manipulate camera if available

- FFMPEG*
  - Add symbols
    - avcodec_register_all
    - av_realloc (was missing)
    - avdevice_register_all

  - Load libavdevice (opt)

  - Camera:
    - Use <ID> (windows) and /dev/video<ID> other OS
    - simply find the input format in native code

  - Support YUYV422 (used in video4linux2, etc.)
    - Stuff 2x 16bpp (YUYV) into one RGBA pixel!
    - Add texture format for 16bpp
    - Add texture lookup shader

  - Fix av_packet leak in readNextImpl(..)
    - Restore orig pointer and size values,
      we may have moved along within packet.
      Then call av_free_packet().

  - Use null AudioSink if audio-id is NONE
---
 make/resources/android/res-test/values/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'make/resources/android/res-test/values')

diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml
index 0b7bd2d51..072cf47e6 100644
--- a/make/resources/android/res-test/values/strings.xml
+++ b/make/resources/android/res-test/values/strings.xml
@@ -23,12 +23,14 @@
     <string name="activity_graphui2p_descr">GraphUI 2-pass</string>
     <string name="activity_elektro_name">Elektro</string>
     <string name="activity_elektro_descr">Elektro</string>
-    <string name="activity_moviesimple0a_name">MovieSimple0a</string>
     <string name="activity_moviesimple0b_name">MovieSimple0b</string>
+    <string name="activity_moviesimple0c_name">CamSimple0</string>
     <string name="activity_moviesimple1a_name">MovieSimple1a</string>
     <string name="activity_moviesimple1b_name">MovieSimple1b</string>
     <string name="activity_moviesimple2_name">MovieSimple2</string>
     <string name="activity_moviesimple_descr">MovieSimple</string>
     <string name="activity_moviecube0_name">MovieCube0</string>
+    <string name="activity_moviecube1a_name">CamCube0</string>
+    <string name="activity_moviecube1b_name">CamCube1</string>
     <string name="activity_moviecube_descr">MovieCube</string>
 </resources>
-- 
cgit v1.2.3