Drop support of Android version before 5.0.
Unified · Split
| @@ -3133,7 +3133,7 @@ d3d11va_deps="dxva_h ID3D11VideoDecoder ID3D11VideoContext" · 3132 unmodified lines | ||
| 3133 | 3133 | d3d12va_deps="dxva_h ID3D12Device ID3D12VideoDecoder" |
| 3134 | 3134 | dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode ole32 user32" |
| 3135 | 3135 | ffnvcodec_deps_any="libdl LoadLibrary" |
| 3136 | −mediacodec_deps="android" | |
| 3136 | +mediacodec_deps="android mediandk" | |
| 3137 | 3137 | nvdec_deps="ffnvcodec" |
| 3138 | 3138 | vaapi_x11_deps="xlib_x11" |
| 3139 | 3139 | videotoolbox_hwaccel_deps="videotoolbox pthreads" |
| @@ -1828,25 +1828,8 @@ typedef struct FFAMediaFormatNdk { · 1827 unmodified lines | ||
| 1828 | 1828 | void *libmedia; |
| 1829 | 1829 | AMediaFormat *impl; |
| 1830 | 1830 | |
| 1831 | − AMediaFormat *(*new)(void); | |
| 1832 | − media_status_t (*delete)(AMediaFormat*); | |
| 1833 | − | |
| 1834 | − const char* (*toString)(AMediaFormat*); | |
| 1835 | − | |
| 1836 | − bool (*getInt32)(AMediaFormat*, const char *name, int32_t *out); | |
| 1837 | − bool (*getInt64)(AMediaFormat*, const char *name, int64_t *out); | |
| 1838 | − bool (*getFloat)(AMediaFormat*, const char *name, float *out); | |
| 1839 | − bool (*getSize)(AMediaFormat*, const char *name, size_t *out); | |
| 1840 | − bool (*getBuffer)(AMediaFormat*, const char *name, void** data, size_t *size); | |
| 1841 | − bool (*getString)(AMediaFormat*, const char *name, const char **out); | |
| 1842 | 1831 | bool (*getRect)(AMediaFormat *, const char *name, |
| 1843 | 1832 | int32_t *left, int32_t *top, int32_t *right, int32_t *bottom); |
| 1844 | − | |
| 1845 | − void (*setInt32)(AMediaFormat*, const char* name, int32_t value); | |
| 1846 | − void (*setInt64)(AMediaFormat*, const char* name, int64_t value); | |
| 1847 | − void (*setFloat)(AMediaFormat*, const char* name, float value); | |
| 1848 | − void (*setString)(AMediaFormat*, const char* name, const char* value); | |
| 1849 | − void (*setBuffer)(AMediaFormat*, const char* name, const void* data, size_t size); | |
| 1850 | 1833 | void (*setRect)(AMediaFormat *, const char *name, |
| 1851 | 1834 | int32_t left, int32_t top, int32_t right, int32_t bottom); |
| 1852 | 1835 | } FFAMediaFormatNdk; |
| @@ -1858,34 +1841,6 @@ typedef struct FFAMediaCodecNdk { · 5 unmodified lines | ||
| 1858 | 1841 | AMediaCodec *impl; |
| 1859 | 1842 | ANativeWindow *window; |
| 1860 | 1843 | |
| 1861 | − AMediaCodec* (*createCodecByName)(const char *name); | |
| 1862 | − AMediaCodec* (*createDecoderByType)(const char *mime_type); | |
| 1863 | − AMediaCodec* (*createEncoderByType)(const char *mime_type); | |
| 1864 | − media_status_t (*delete)(AMediaCodec*); | |
| 1865 | − | |
| 1866 | − media_status_t (*configure)(AMediaCodec *, | |
| 1867 | − const AMediaFormat *format, | |
| 1868 | − ANativeWindow *surface, | |
| 1869 | − AMediaCrypto *crypto, | |
| 1870 | − uint32_t flags); | |
| 1871 | − media_status_t (*start)(AMediaCodec*); | |
| 1872 | − media_status_t (*stop)(AMediaCodec*); | |
| 1873 | − media_status_t (*flush)(AMediaCodec*); | |
| 1874 | − | |
| 1875 | − uint8_t* (*getInputBuffer)(AMediaCodec*, size_t idx, size_t *out_size); | |
| 1876 | − uint8_t* (*getOutputBuffer)(AMediaCodec*, size_t idx, size_t *out_size); | |
| 1877 | − | |
| 1878 | − ssize_t (*dequeueInputBuffer)(AMediaCodec*, int64_t timeoutUs); | |
| 1879 | − media_status_t (*queueInputBuffer)(AMediaCodec*, size_t idx, | |
| 1880 | − long offset, size_t size, | |
| 1881 | − uint64_t time, uint32_t flags); | |
| 1882 | − | |
| 1883 | − ssize_t (*dequeueOutputBuffer)(AMediaCodec*, AMediaCodecBufferInfo *info, int64_t timeoutUs); | |
| 1884 | − AMediaFormat* (*getOutputFormat)(AMediaCodec*); | |
| 1885 | − | |
| 1886 | − media_status_t (*releaseOutputBuffer)(AMediaCodec*, size_t idx, bool render); | |
| 1887 | − media_status_t (*releaseOutputBufferAtTime)(AMediaCodec *mData, size_t idx, int64_t timestampNs); | |
| 1888 | − | |
| 1889 | 1844 | // Available since API level 28. |
| 1890 | 1845 | media_status_t (*getName)(AMediaCodec*, char** out_name); |
| 1891 | 1846 | void (*releaseName)(AMediaCodec*, char* name); |
| @@ -1925,38 +1880,15 @@ static FFAMediaFormat *mediaformat_ndk_create(AMediaFormat *impl) · 33 unmodified lines | ||
| 1925 | 1880 | #define GET_OPTIONAL_SYMBOL(sym) \ |
| 1926 | 1881 | format->sym = dlsym(format->libmedia, "AMediaFormat_" #sym); |
| 1927 | 1882 | |
| 1928 | −#define GET_SYMBOL(sym) \ | |
| 1929 | − GET_OPTIONAL_SYMBOL(sym) \ | |
| 1930 | − if (!format->sym) \ | |
| 1931 | − goto error; | |
| 1932 | − | |
| 1933 | − GET_SYMBOL(new) | |
| 1934 | − GET_SYMBOL(delete) | |
| 1935 | − | |
| 1936 | − GET_SYMBOL(toString) | |
| 1937 | − | |
| 1938 | − GET_SYMBOL(getInt32) | |
| 1939 | − GET_SYMBOL(getInt64) | |
| 1940 | − GET_SYMBOL(getFloat) | |
| 1941 | − GET_SYMBOL(getSize) | |
| 1942 | − GET_SYMBOL(getBuffer) | |
| 1943 | − GET_SYMBOL(getString) | |
| 1944 | 1883 | GET_OPTIONAL_SYMBOL(getRect) |
| 1945 | − | |
| 1946 | − GET_SYMBOL(setInt32) | |
| 1947 | − GET_SYMBOL(setInt64) | |
| 1948 | − GET_SYMBOL(setFloat) | |
| 1949 | − GET_SYMBOL(setString) | |
| 1950 | − GET_SYMBOL(setBuffer) | |
| 1951 | 1884 | GET_OPTIONAL_SYMBOL(setRect) |
| 1952 | 1885 | |
| 1953 | −#undef GET_SYMBOL | |
| 1954 | 1886 | #undef GET_OPTIONAL_SYMBOL |
| 1955 | 1887 | |
| 1956 | 1888 | if (impl) { |
| 1957 | 1889 | format->impl = impl; |
| 1958 | 1890 | } else { |
| 1959 | − format->impl = format->new(); | |
| 1891 | + format->impl = AMediaFormat_new(); | |
| 1960 | 1892 | if (!format->impl) |
| 1961 | 1893 | goto error; |
| 1962 | 1894 | } |
| @@ -1984,7 +1916,7 @@ static int mediaformat_ndk_delete(FFAMediaFormat* ctx) · 21 unmodified lines | ||
| 1984 | 1916 | |
| 1985 | 1917 | av_assert0(format->api.class == &amediaformat_ndk_class); |
| 1986 | 1918 | |
| 1987 | − if (format->impl && (format->delete(format->impl) != AMEDIA_OK)) | |
| 1919 | + if (format->impl && (AMediaFormat_delete(format->impl) != AMEDIA_OK)) | |
| 1988 | 1920 | ret = AVERROR_EXTERNAL; |
| 1989 | 1921 | if (format->libmedia) |
| 1990 | 1922 | dlclose(format->libmedia); |
| @@ -1996,39 +1928,39 @@ static int mediaformat_ndk_delete(FFAMediaFormat* ctx) · 5 unmodified lines | ||
| 1996 | 1928 | static char* mediaformat_ndk_toString(FFAMediaFormat* ctx) |
| 1997 | 1929 | { |
| 1998 | 1930 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 1999 | − const char *str = format->toString(format->impl); | |
| 1931 | + const char *str = AMediaFormat_toString(format->impl); | |
| 2000 | 1932 | return av_strdup(str); |
| 2001 | 1933 | } |
| 2002 | 1934 | |
| 2003 | 1935 | static int mediaformat_ndk_getInt32(FFAMediaFormat* ctx, const char *name, int32_t *out) |
| 2004 | 1936 | { |
| 2005 | 1937 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2006 | − return format->getInt32(format->impl, name, out); | |
| 1938 | + return AMediaFormat_getInt32(format->impl, name, out); | |
| 2007 | 1939 | } |
| 2008 | 1940 | |
| 2009 | 1941 | static int mediaformat_ndk_getInt64(FFAMediaFormat* ctx, const char *name, int64_t *out) |
| 2010 | 1942 | { |
| 2011 | 1943 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2012 | − return format->getInt64(format->impl, name, out); | |
| 1944 | + return AMediaFormat_getInt64(format->impl, name, out); | |
| 2013 | 1945 | } |
| 2014 | 1946 | |
| 2015 | 1947 | static int mediaformat_ndk_getFloat(FFAMediaFormat* ctx, const char *name, float *out) |
| 2016 | 1948 | { |
| 2017 | 1949 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2018 | − return format->getFloat(format->impl, name, out); | |
| 1950 | + return AMediaFormat_getFloat(format->impl, name, out); | |
| 2019 | 1951 | } |
| 2020 | 1952 | |
| 2021 | 1953 | static int mediaformat_ndk_getBuffer(FFAMediaFormat* ctx, const char *name, void** data, size_t *size) |
| 2022 | 1954 | { |
| 2023 | 1955 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2024 | − return format->getBuffer(format->impl, name, data, size); | |
| 1956 | + return AMediaFormat_getBuffer(format->impl, name, data, size); | |
| 2025 | 1957 | } |
| 2026 | 1958 | |
| 2027 | 1959 | static int mediaformat_ndk_getString(FFAMediaFormat* ctx, const char *name, const char **out) |
| 2028 | 1960 | { |
| 2029 | 1961 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2030 | 1962 | const char *tmp = NULL; |
| 2031 | − int ret = format->getString(format->impl, name, &tmp); | |
| 1963 | + int ret = AMediaFormat_getString(format->impl, name, &tmp); | |
| 2032 | 1964 | |
| 2033 | 1965 | if (tmp) |
| 2034 | 1966 | *out = av_strdup(tmp); |
| @@ -2047,31 +1979,31 @@ static int mediaformat_ndk_getRect(FFAMediaFormat *ctx, const char *name, · 12 unmodified lines | ||
| 2047 | 1979 | static void mediaformat_ndk_setInt32(FFAMediaFormat* ctx, const char* name, int32_t value) |
| 2048 | 1980 | { |
| 2049 | 1981 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2050 | − format->setInt32(format->impl, name, value); | |
| 1982 | + AMediaFormat_setInt32(format->impl, name, value); | |
| 2051 | 1983 | } |
| 2052 | 1984 | |
| 2053 | 1985 | static void mediaformat_ndk_setInt64(FFAMediaFormat* ctx, const char* name, int64_t value) |
| 2054 | 1986 | { |
| 2055 | 1987 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2056 | − format->setInt64(format->impl, name, value); | |
| 1988 | + AMediaFormat_setInt64(format->impl, name, value); | |
| 2057 | 1989 | } |
| 2058 | 1990 | |
| 2059 | 1991 | static void mediaformat_ndk_setFloat(FFAMediaFormat* ctx, const char* name, float value) |
| 2060 | 1992 | { |
| 2061 | 1993 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2062 | − format->setFloat(format->impl, name, value); | |
| 1994 | + AMediaFormat_setFloat(format->impl, name, value); | |
| 2063 | 1995 | } |
| 2064 | 1996 | |
| 2065 | 1997 | static void mediaformat_ndk_setString(FFAMediaFormat* ctx, const char* name, const char* value) |
| 2066 | 1998 | { |
| 2067 | 1999 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2068 | − format->setString(format->impl, name, value); | |
| 2000 | + AMediaFormat_setString(format->impl, name, value); | |
| 2069 | 2001 | } |
| 2070 | 2002 | |
| 2071 | 2003 | static void mediaformat_ndk_setBuffer(FFAMediaFormat* ctx, const char* name, void* data, size_t size) |
| 2072 | 2004 | { |
| 2073 | 2005 | FFAMediaFormatNdk *format = (FFAMediaFormatNdk *)ctx; |
| 2074 | − format->setBuffer(format->impl, name, data, size); | |
| 2006 | + AMediaFormat_setBuffer(format->impl, name, data, size); | |
| 2075 | 2007 | } |
| 2076 | 2008 | |
| 2077 | 2009 | static void mediaformat_ndk_setRect(FFAMediaFormat *ctx, const char *name, |
| @@ -2117,54 +2049,28 @@ static inline FFAMediaCodec *ndk_codec_create(int method, const char *arg) { · 39 unmodified lines | ||
| 2117 | 2049 | if (!codec->libmedia) |
| 2118 | 2050 | goto error; |
| 2119 | 2051 | |
| 2120 | −#define GET_SYMBOL(sym, required) \ | |
| 2052 | +#define GET_SYMBOL(sym) \ | |
| 2121 | 2053 | codec->sym = dlsym(codec->libmedia, "AMediaCodec_" #sym); \ |
| 2122 | − if (!codec->sym) { \ | |
| 2123 | − av_log(codec, required ? AV_LOG_ERROR : AV_LOG_INFO, \ | |
| 2124 | − #sym "() unavailable from %s\n", lib_name); \ | |
| 2125 | − if (required) \ | |
| 2126 | − goto error; \ | |
| 2127 | − } | |
| 2128 | − | |
| 2129 | − GET_SYMBOL(createCodecByName, 1) | |
| 2130 | − GET_SYMBOL(createDecoderByType, 1) | |
| 2131 | − GET_SYMBOL(createEncoderByType, 1) | |
| 2132 | − GET_SYMBOL(delete, 1) | |
| 2133 | − | |
| 2134 | − GET_SYMBOL(configure, 1) | |
| 2135 | − GET_SYMBOL(start, 1) | |
| 2136 | − GET_SYMBOL(stop, 1) | |
| 2137 | − GET_SYMBOL(flush, 1) | |
| 2138 | − | |
| 2139 | − GET_SYMBOL(getInputBuffer, 1) | |
| 2140 | − GET_SYMBOL(getOutputBuffer, 1) | |
| 2141 | − | |
| 2142 | − GET_SYMBOL(dequeueInputBuffer, 1) | |
| 2143 | − GET_SYMBOL(queueInputBuffer, 1) | |
| 2144 | − | |
| 2145 | − GET_SYMBOL(dequeueOutputBuffer, 1) | |
| 2146 | − GET_SYMBOL(getOutputFormat, 1) | |
| 2147 | − | |
| 2148 | − GET_SYMBOL(releaseOutputBuffer, 1) | |
| 2149 | − GET_SYMBOL(releaseOutputBufferAtTime, 1) | |
| 2054 | + if (!codec->sym) \ | |
| 2055 | + av_log(codec, AV_LOG_INFO, #sym "() unavailable from %s\n", lib_name); | |
| 2150 | 2056 | |
| 2151 | − GET_SYMBOL(getName, 0) | |
| 2152 | − GET_SYMBOL(releaseName, 0) | |
| 2057 | + GET_SYMBOL(getName) | |
| 2058 | + GET_SYMBOL(releaseName) | |
| 2153 | 2059 | |
| 2154 | − GET_SYMBOL(setInputSurface, 0) | |
| 2155 | − GET_SYMBOL(signalEndOfInputStream, 0) | |
| 2060 | + GET_SYMBOL(setInputSurface) | |
| 2061 | + GET_SYMBOL(signalEndOfInputStream) | |
| 2156 | 2062 | |
| 2157 | 2063 | #undef GET_SYMBOL |
| 2158 | 2064 | |
| 2159 | 2065 | switch (method) { |
| 2160 | 2066 | case CREATE_CODEC_BY_NAME: |
| 2161 | − codec->impl = codec->createCodecByName(arg); | |
| 2067 | + codec->impl = AMediaCodec_createCodecByName(arg); | |
| 2162 | 2068 | break; |
| 2163 | 2069 | case CREATE_DECODER_BY_TYPE: |
| 2164 | − codec->impl = codec->createDecoderByType(arg); | |
| 2070 | + codec->impl = AMediaCodec_createDecoderByType(arg); | |
| 2165 | 2071 | break; |
| 2166 | 2072 | case CREATE_ENCODER_BY_TYPE: |
| 2167 | − codec->impl = codec->createEncoderByType(arg); | |
| 2073 | + codec->impl = AMediaCodec_createEncoderByType(arg); | |
| 2168 | 2074 | break; |
| 2169 | 2075 | default: |
| 2170 | 2076 | av_assert0(0); |
| @@ -2201,7 +2107,7 @@ static int mediacodec_ndk_delete(FFAMediaCodec* ctx) · 30 unmodified lines | ||
| 2201 | 2107 | |
| 2202 | 2108 | av_assert0(codec->api.class == &amediacodec_ndk_class); |
| 2203 | 2109 | |
| 2204 | − if (codec->impl && (codec->delete(codec->impl) != AMEDIA_OK)) | |
| 2110 | + if (codec->impl && (AMediaCodec_delete(codec->impl) != AMEDIA_OK)) | |
| 2205 | 2111 | ret = AVERROR_EXTERNAL; |
| 2206 | 2112 | if (codec->window) |
| 2207 | 2113 | ANativeWindow_release(codec->window); |
| @@ -2246,7 +2152,7 @@ static int mediacodec_ndk_configure(FFAMediaCodec* ctx, · 38 unmodified lines | ||
| 2246 | 2152 | return AVERROR_EXTERNAL; |
| 2247 | 2153 | } |
| 2248 | 2154 | |
| 2249 | − status = codec->configure(codec->impl, format->impl, NULL, NULL, flags); | |
| 2155 | + status = AMediaCodec_configure(codec->impl, format->impl, NULL, NULL, flags); | |
| 2250 | 2156 | if (status != AMEDIA_OK) { |
| 2251 | 2157 | av_log(codec, AV_LOG_ERROR, "Encoder configure failed, %d\n", status); |
| 2252 | 2158 | return AVERROR_EXTERNAL; |
| @@ -2261,7 +2167,7 @@ static int mediacodec_ndk_configure(FFAMediaCodec* ctx, · 8 unmodified lines | ||
| 2261 | 2167 | return AVERROR_EXTERNAL; |
| 2262 | 2168 | } |
| 2263 | 2169 | } else { |
| 2264 | − status = codec->configure(codec->impl, format->impl, native_window, NULL, flags); | |
| 2170 | + status = AMediaCodec_configure(codec->impl, format->impl, native_window, NULL, flags); | |
| 2265 | 2171 | if (status != AMEDIA_OK) { |
| 2266 | 2172 | av_log(codec, AV_LOG_ERROR, "Decoder configure failed, %d\n", status); |
| 2267 | 2173 | return AVERROR_EXTERNAL; |
| @@ -2275,7 +2181,7 @@ static int mediacodec_ndk_configure(FFAMediaCodec* ctx, · 7 unmodified lines | ||
| 2275 | 2181 | static int mediacodec_ndk_ ## method(FFAMediaCodec* ctx) \ |
| 2276 | 2182 | { \ |
| 2277 | 2183 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; \ |
| 2278 | − media_status_t status = codec->method(codec->impl); \ | |
| 2184 | + media_status_t status = AMediaCodec_ ## method (codec->impl); \ | |
| 2279 | 2185 | \ |
| 2280 | 2186 | if (status != AMEDIA_OK) { \ |
| 2281 | 2187 | av_log(codec, AV_LOG_ERROR, #method " failed, %d\n", status); \ |
| @@ -2292,19 +2198,19 @@ MEDIACODEC_NDK_WRAPPER(flush) · 10 unmodified lines | ||
| 2292 | 2198 | static uint8_t* mediacodec_ndk_getInputBuffer(FFAMediaCodec* ctx, size_t idx, size_t *out_size) |
| 2293 | 2199 | { |
| 2294 | 2200 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2295 | − return codec->getInputBuffer(codec->impl, idx, out_size); | |
| 2201 | + return AMediaCodec_getInputBuffer(codec->impl, idx, out_size); | |
| 2296 | 2202 | } |
| 2297 | 2203 | |
| 2298 | 2204 | static uint8_t* mediacodec_ndk_getOutputBuffer(FFAMediaCodec* ctx, size_t idx, size_t *out_size) |
| 2299 | 2205 | { |
| 2300 | 2206 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2301 | − return codec->getOutputBuffer(codec->impl, idx, out_size); | |
| 2207 | + return AMediaCodec_getOutputBuffer(codec->impl, idx, out_size); | |
| 2302 | 2208 | } |
| 2303 | 2209 | |
| 2304 | 2210 | static ssize_t mediacodec_ndk_dequeueInputBuffer(FFAMediaCodec* ctx, int64_t timeoutUs) |
| 2305 | 2211 | { |
| 2306 | 2212 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2307 | − return codec->dequeueInputBuffer(codec->impl, timeoutUs); | |
| 2213 | + return AMediaCodec_dequeueInputBuffer(codec->impl, timeoutUs); | |
| 2308 | 2214 | } |
| 2309 | 2215 | |
| 2310 | 2216 | static int mediacodec_ndk_queueInputBuffer(FFAMediaCodec *ctx, size_t idx, |
| @@ -2312,7 +2218,7 @@ static int mediacodec_ndk_queueInputBuffer(FFAMediaCodec *ctx, size_t idx, · 1 unmodified line | ||
| 2312 | 2218 | uint64_t time, uint32_t flags) |
| 2313 | 2219 | { |
| 2314 | 2220 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2315 | − return codec->queueInputBuffer(codec->impl, idx, offset, size, time, flags); | |
| 2221 | + return AMediaCodec_queueInputBuffer(codec->impl, idx, offset, size, time, flags); | |
| 2316 | 2222 | } |
| 2317 | 2223 | |
| 2318 | 2224 | static ssize_t mediacodec_ndk_dequeueOutputBuffer(FFAMediaCodec* ctx, FFAMediaCodecBufferInfo *info, int64_t timeoutUs) |
| @@ -2321,7 +2227,7 @@ static ssize_t mediacodec_ndk_dequeueOutputBuffer(FFAMediaCodec* ctx, FFAMediaCo · 2 unmodified lines | ||
| 2321 | 2227 | AMediaCodecBufferInfo buf_info = {0}; |
| 2322 | 2228 | ssize_t ret; |
| 2323 | 2229 | |
| 2324 | − ret = codec->dequeueOutputBuffer(codec->impl, &buf_info, timeoutUs); | |
| 2230 | + ret = AMediaCodec_dequeueOutputBuffer(codec->impl, &buf_info, timeoutUs); | |
| 2325 | 2231 | info->offset = buf_info.offset; |
| 2326 | 2232 | info->size = buf_info.size; |
| 2327 | 2233 | info->presentationTimeUs = buf_info.presentationTimeUs; |
| @@ -2333,7 +2239,7 @@ static ssize_t mediacodec_ndk_dequeueOutputBuffer(FFAMediaCodec* ctx, FFAMediaCo · 5 unmodified lines | ||
| 2333 | 2239 | static FFAMediaFormat* mediacodec_ndk_getOutputFormat(FFAMediaCodec* ctx) |
| 2334 | 2240 | { |
| 2335 | 2241 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2336 | − AMediaFormat *format = codec->getOutputFormat(codec->impl); | |
| 2242 | + AMediaFormat *format = AMediaCodec_getOutputFormat(codec->impl); | |
| 2337 | 2243 | |
| 2338 | 2244 | if (!format) |
| 2339 | 2245 | return NULL; |
| @@ -2345,7 +2251,7 @@ static int mediacodec_ndk_releaseOutputBuffer(FFAMediaCodec* ctx, size_t idx, in · 5 unmodified lines | ||
| 2345 | 2251 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2346 | 2252 | media_status_t status; |
| 2347 | 2253 | |
| 2348 | − status = codec->releaseOutputBuffer(codec->impl, idx, render); | |
| 2254 | + status = AMediaCodec_releaseOutputBuffer(codec->impl, idx, render); | |
| 2349 | 2255 | if (status != AMEDIA_OK) { |
| 2350 | 2256 | av_log(codec, AV_LOG_ERROR, "release output buffer failed, %d\n", status); |
| 2351 | 2257 | return AVERROR_EXTERNAL; |
| @@ -2359,7 +2265,7 @@ static int mediacodec_ndk_releaseOutputBufferAtTime(FFAMediaCodec *ctx, size_t i · 7 unmodified lines | ||
| 2359 | 2265 | FFAMediaCodecNdk *codec = (FFAMediaCodecNdk *)ctx; |
| 2360 | 2266 | media_status_t status; |
| 2361 | 2267 | |
| 2362 | − status = codec->releaseOutputBufferAtTime(codec->impl, idx, timestampNs); | |
| 2268 | + status = AMediaCodec_releaseOutputBufferAtTime(codec->impl, idx, timestampNs); | |
| 2363 | 2269 | if (status != AMEDIA_OK) { |
| 2364 | 2270 | av_log(codec, AV_LOG_ERROR, "releaseOutputBufferAtTime failed, %d\n", status); |
| 2365 | 2271 | return AVERROR_EXTERNAL; |