diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-05-16 07:40:46 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-05-16 07:40:46 +0000 |
| commit | 83bb4f23dc439c99df6dc39abb8626631f705e48 (patch) | |
| tree | 87d5a8f62eb4aad08606ee5b19aad1d72be6c519 /main/omxplayer/omxplayer-alsa.patch | |
| parent | a224e7438ba752caa259dc3c0bfcb3aa1e38a379 (diff) | |
| download | aports-83bb4f23dc439c99df6dc39abb8626631f705e48.tar.bz2 aports-83bb4f23dc439c99df6dc39abb8626631f705e48.tar.xz | |
main/omxplayer: upgrade to 20160513, add dbus fix
Diffstat (limited to 'main/omxplayer/omxplayer-alsa.patch')
| -rw-r--r-- | main/omxplayer/omxplayer-alsa.patch | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/main/omxplayer/omxplayer-alsa.patch b/main/omxplayer/omxplayer-alsa.patch index 931c59fdc7..7b9f3c8c2d 100644 --- a/main/omxplayer/omxplayer-alsa.patch +++ b/main/omxplayer/omxplayer-alsa.patch @@ -1,5 +1,23 @@ +From b03115afd6322093e83b37660727a1a7257cc11d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Sat, 14 May 2016 16:27:32 +0300 +Subject: [PATCH] Initial alsa support + +--- + Makefile | 5 +- + OMXAudio.cpp | 5 +- + OMXAudio.h | 1 + + OMXCore.cpp | 11 + + README.md | 1 + + linux/OMXAlsa.cpp | 1314 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + linux/OMXAlsa.h | 11 + + omxplayer.cpp | 6 +- + 8 files changed, 1349 insertions(+), 5 deletions(-) + create mode 100644 linux/OMXAlsa.cpp + create mode 100644 linux/OMXAlsa.h + diff --git a/Makefile b/Makefile -index 9fc45de..5337ee7 100644 +index bcfadfb..2857e94 100644 --- a/Makefile +++ b/Makefile @@ -2,13 +2,14 @@ include Makefile.include @@ -20,7 +38,7 @@ index 9fc45de..5337ee7 100644 DynamicDll.cpp \ utils/PCMRemap.cpp \ diff --git a/OMXAudio.cpp b/OMXAudio.cpp -index 6da019f..434ced7 100644 +index e5d6365..99aa093 100644 --- a/OMXAudio.cpp +++ b/OMXAudio.cpp @@ -104,7 +104,8 @@ bool COMXAudio::PortSettingsChanged() @@ -91,7 +109,7 @@ index 9d5fe61..548ed2f 100644 if (omx_err != OMX_ErrorNone) { diff --git a/README.md b/README.md -index 726127c..cc718b1 100644 +index 777de57..8c78ade 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ Usage: omxplayer [OPTIONS] [FILE] @@ -104,10 +122,10 @@ index 726127c..cc718b1 100644 -s --stats Pts and buffer stats diff --git a/linux/OMXAlsa.cpp b/linux/OMXAlsa.cpp new file mode 100644 -index 0000000..fe51eb1 +index 0000000..6bac222 --- /dev/null +++ b/linux/OMXAlsa.cpp -@@ -0,0 +1,1313 @@ +@@ -0,0 +1,1314 @@ +/* + * OMX IL Alsa Sink component + * Copyright (c) 2016 Timo Teräs @@ -1238,6 +1256,7 @@ index 0000000..fe51eb1 + spx_int16_t *in_ptr; + uint8_t *out_ptr; + spx_uint32_t in_len, out_len; ++ + pthread_mutex_unlock(&comp->mutex); + + in_ptr = (spx_int16_t *)(buf->pBuffer + buf->nOffset); @@ -1439,10 +1458,10 @@ index 0000000..b849288 +OMX_API OMX_ERRORTYPE OMX_APIENTRY OMXALSA_FreeHandle( + OMX_IN OMX_HANDLETYPE hComponent); diff --git a/omxplayer.cpp b/omxplayer.cpp -index 3b5e6d2..4032ba3 100644 +index 7e5dd03..7dddd31 100644 --- a/omxplayer.cpp +++ b/omxplayer.cpp -@@ -574,6 +574,7 @@ int main(int argc, char *argv[]) +@@ -578,6 +578,7 @@ int main(int argc, char *argv[]) { "keys", no_argument, NULL, 'k' }, { "aidx", required_argument, NULL, 'n' }, { "adev", required_argument, NULL, 'o' }, @@ -1450,16 +1469,16 @@ index 3b5e6d2..4032ba3 100644 { "stats", no_argument, NULL, 's' }, { "passthrough", no_argument, NULL, 'p' }, { "vol", required_argument, NULL, vol_opt }, -@@ -640,7 +641,7 @@ int main(int argc, char *argv[]) +@@ -646,7 +647,7 @@ int main(int argc, char *argv[]) //Build default keymap just in case the --key-config option isn't used map<int,int> keymap = KeyConfig::buildDefaultKeymap(); -- while ((c = getopt_long(argc, argv, "wiIhvkn:l:o:cslbpd3:Myzt:rg", longopts, NULL)) != -1) -+ while ((c = getopt_long(argc, argv, "wiIhvkn:l:o:A:cslbpd3:Myzt:rg", longopts, NULL)) != -1) +- while ((c = getopt_long(argc, argv, "wiIhvkn:l:o:cslb::pd3:Myzt:rg", longopts, NULL)) != -1) ++ while ((c = getopt_long(argc, argv, "wiIhvkn:l:o:A:cslb::pd3:Myzt:rg", longopts, NULL)) != -1) { switch (c) { -@@ -708,6 +709,9 @@ int main(int argc, char *argv[]) +@@ -714,6 +715,9 @@ int main(int argc, char *argv[]) } m_config_audio.device = "omx:" + m_config_audio.device; break; @@ -1469,3 +1488,7 @@ index 3b5e6d2..4032ba3 100644 case 'i': m_dump_format = true; m_dump_format_exit = true; +-- +2.8.2 + + |