mirror of https://github.com/sipwise/jitsi.git
Damian Minkov
12 years ago
parent
d922f477da
commit
a8453f66f1
@ -0,0 +1,42 @@
|
|||||||
|
Manifest-Version: 1.0
|
||||||
|
Archiver-Version: Plexus Archiver
|
||||||
|
Created-By: Apache Maven Bundle Plugin
|
||||||
|
Built-By: hen
|
||||||
|
Build-Jdk: 1.5.0_22
|
||||||
|
Implementation-Build: UNKNOWN_BRANCH@r??????; 2011-11-09 22:58:07-0800
|
||||||
|
Implementation-Title: Commons Lang
|
||||||
|
Implementation-Vendor: The Apache Software Foundation
|
||||||
|
Implementation-Vendor-Id: org.apache
|
||||||
|
Implementation-Version: 3.1
|
||||||
|
Specification-Title: Commons Lang
|
||||||
|
Specification-Vendor: The Apache Software Foundation
|
||||||
|
Specification-Version: 3.1
|
||||||
|
X-Compile-Source-JDK: 1.5
|
||||||
|
X-Compile-Target-JDK: 1.5
|
||||||
|
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||||
|
Include-Resource: templates/release-notes.vm=src/main/resources/templa
|
||||||
|
tes/release-notes.vm,META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE
|
||||||
|
.txt=NOTICE.txt
|
||||||
|
Bnd-LastModified: 1320908300777
|
||||||
|
Export-Package: org.apache.commons.lang3.event;version="3.1",org.apach
|
||||||
|
e.commons.lang3.mutable;version="3.1",org.apache.commons.lang3.tuple;
|
||||||
|
version="3.1",org.apache.commons.lang3.time;version="3.1",org.apache.
|
||||||
|
commons.lang3.concurrent;version="3.1",org.apache.commons.lang3.text.
|
||||||
|
translate;version="3.1",org.apache.commons.lang3.text;version="3.1",o
|
||||||
|
rg.apache.commons.lang3.math;version="3.1",org.apache.commons.lang3;v
|
||||||
|
ersion="3.1",org.apache.commons.lang3.exception;version="3.1",org.apa
|
||||||
|
che.commons.lang3.reflect;version="3.1",org.apache.commons.lang3.buil
|
||||||
|
der;version="3.1"
|
||||||
|
Bundle-Version: 3.1.0
|
||||||
|
Bundle-Name: Commons Lang
|
||||||
|
Bundle-Description: Commons Lang, a package of Java utility classes fo
|
||||||
|
r the classes that are in java.lang's hierarchy, or are considered t
|
||||||
|
o be so standard as to justify existence in java.lang.
|
||||||
|
Private-Package: templates
|
||||||
|
Bundle-DocURL: http://commons.apache.org/lang/
|
||||||
|
Bundle-Vendor: The Apache Software Foundation
|
||||||
|
Bundle-ManifestVersion: 2
|
||||||
|
Bundle-SymbolicName: org.apache.commons.lang3
|
||||||
|
Tool: Bnd-1.15.0
|
||||||
|
Bundle-ClassPath: .,commons-lang.jar
|
||||||
|
|
||||||
@ -1,4 +1,7 @@
|
|||||||
usr/share/java/commons-codec.jar usr/share/_PACKAGE_NAME_/sc-bundles/commons-codec.jar
|
usr/share/java/commons-codec.jar usr/share/_PACKAGE_NAME_/sc-bundles/commons-codec.jar
|
||||||
usr/share/java/commons-lang3.jar usr/share/_PACKAGE_NAME_/sc-bundles/commons-lang.jar
|
|
||||||
usr/share/java/log4j-1.2.jar usr/share/_PACKAGE_NAME_/lib/bundle/log4j.jar
|
usr/share/java/log4j-1.2.jar usr/share/_PACKAGE_NAME_/lib/bundle/log4j.jar
|
||||||
usr/share/java/commons-logging.jar usr/share/_PACKAGE_NAME_/lib/bundle/commons-logging.jar
|
usr/share/java/commons-logging.jar usr/share/_PACKAGE_NAME_/lib/bundle/commons-logging.jar
|
||||||
|
usr/share/java/httpcore.jar usr/share/_PACKAGE_NAME_/sc-bundles/httpcore.jar
|
||||||
|
usr/share/java/httpclient.jar usr/share/_PACKAGE_NAME_/sc-bundles/httpclient.jar
|
||||||
|
usr/share/java/guava.jar usr/share/_PACKAGE_NAME_/sc-bundles/guava.jar
|
||||||
|
usr/share/java/hsqldb.jar usr/share/_PACKAGE_NAME_/sc-bundles/hsqldb.jar
|
||||||
|
|||||||
@ -0,0 +1,150 @@
|
|||||||
|
Index: jitsi/src/net/java/sip/communicator/impl/dns/DnsJavaLogger.java
|
||||||
|
===================================================================
|
||||||
|
--- jitsi.orig/src/net/java/sip/communicator/impl/dns/DnsJavaLogger.java 2014-06-13 07:08:10.000000000 -0400
|
||||||
|
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
|
@@ -1,132 +0,0 @@
|
||||||
|
-/*
|
||||||
|
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
|
||||||
|
- *
|
||||||
|
- * Distributable under LGPL license.
|
||||||
|
- * See terms of license at gnu.org.
|
||||||
|
- */
|
||||||
|
-package net.java.sip.communicator.impl.dns;
|
||||||
|
-
|
||||||
|
-import net.java.sip.communicator.util.*;
|
||||||
|
-import org.jitsi.service.packetlogging.*;
|
||||||
|
-import org.xbill.DNS.*;
|
||||||
|
-
|
||||||
|
-import java.net.*;
|
||||||
|
-
|
||||||
|
-/**
|
||||||
|
- * Custom logger that will log packages using packet logging service.
|
||||||
|
- *
|
||||||
|
- * @author Damian Minkov
|
||||||
|
- */
|
||||||
|
-public class DnsJavaLogger
|
||||||
|
- implements CustomLogger
|
||||||
|
-{
|
||||||
|
- /**
|
||||||
|
- * The logger.
|
||||||
|
- */
|
||||||
|
- private static final Logger logger
|
||||||
|
- = Logger.getLogger(DnsJavaLogger.class);
|
||||||
|
-
|
||||||
|
- /**
|
||||||
|
- * The packet logging service.
|
||||||
|
- */
|
||||||
|
- private PacketLoggingService packetLoggingService = null;
|
||||||
|
-
|
||||||
|
- /**
|
||||||
|
- * Obtain packet logging service.
|
||||||
|
- * @return
|
||||||
|
- */
|
||||||
|
- private PacketLoggingService getPacketLoggingService()
|
||||||
|
- {
|
||||||
|
- if(packetLoggingService == null
|
||||||
|
- && UtilActivator.bundleContext != null)
|
||||||
|
- {
|
||||||
|
- packetLoggingService = ServiceUtils.getService(
|
||||||
|
- UtilActivator.bundleContext,
|
||||||
|
- PacketLoggingService.class);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- return packetLoggingService;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- @Override
|
||||||
|
- public void log(SocketAddress local,
|
||||||
|
- SocketAddress remote,
|
||||||
|
- String prefix, byte[] data)
|
||||||
|
- {
|
||||||
|
- // make sure that error here will not stop further processing
|
||||||
|
- try
|
||||||
|
- {
|
||||||
|
- logInternal(local, remote, prefix, data);
|
||||||
|
- }
|
||||||
|
- catch(Throwable t)
|
||||||
|
- {
|
||||||
|
- logger.error("Error saving packet", t);
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /**
|
||||||
|
- * Logs the dns packet, checking its prefix message to distinguish
|
||||||
|
- * incoming and outgoing messages and the transport used TCP or UDP.
|
||||||
|
- *
|
||||||
|
- * @param local the local address
|
||||||
|
- * @param remote the remote address
|
||||||
|
- * @param prefix the prefix used by the dns lib
|
||||||
|
- * @param data the data that is send or received through the wire
|
||||||
|
- */
|
||||||
|
- private void logInternal(SocketAddress local,
|
||||||
|
- SocketAddress remote,
|
||||||
|
- String prefix, byte[] data)
|
||||||
|
- {
|
||||||
|
- if(getPacketLoggingService() == null
|
||||||
|
- || !(local instanceof InetSocketAddress
|
||||||
|
- && remote instanceof InetSocketAddress))
|
||||||
|
- {
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- InetSocketAddress localAddress = (InetSocketAddress)local;
|
||||||
|
- InetSocketAddress remoteAddress = (InetSocketAddress)remote;
|
||||||
|
-
|
||||||
|
- PacketLoggingService.TransportName transportName
|
||||||
|
- = PacketLoggingService.TransportName.UDP;
|
||||||
|
-
|
||||||
|
- if(prefix.contains("TCP"))
|
||||||
|
- transportName = PacketLoggingService.TransportName.TCP;
|
||||||
|
-
|
||||||
|
- boolean isSender = true;
|
||||||
|
- if(prefix.contains("read"))
|
||||||
|
- isSender = false;
|
||||||
|
-
|
||||||
|
- byte[] srcAddr;
|
||||||
|
- int srcPort;
|
||||||
|
- byte[] dstAddr;
|
||||||
|
- int dstPort;
|
||||||
|
-
|
||||||
|
- if(isSender)
|
||||||
|
- {
|
||||||
|
- srcAddr = localAddress.getAddress().getAddress();
|
||||||
|
- srcPort = localAddress.getPort();
|
||||||
|
- dstAddr = remoteAddress.getAddress().getAddress();
|
||||||
|
- dstPort = remoteAddress.getPort();
|
||||||
|
- }
|
||||||
|
- else
|
||||||
|
- {
|
||||||
|
- dstAddr = localAddress.getAddress().getAddress();
|
||||||
|
- dstPort = localAddress.getPort();
|
||||||
|
- srcAddr = remoteAddress.getAddress().getAddress();
|
||||||
|
- srcPort = remoteAddress.getPort();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- getPacketLoggingService().logPacket(
|
||||||
|
- PacketLoggingService.ProtocolName.DNS,
|
||||||
|
- srcAddr,
|
||||||
|
- srcPort,
|
||||||
|
- dstAddr,
|
||||||
|
- dstPort,
|
||||||
|
- transportName,
|
||||||
|
- isSender,
|
||||||
|
- data,
|
||||||
|
- 0,
|
||||||
|
- data.length);
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
Index: debian/src/net/java/sip/communicator/impl/dns/DnsUtilActivator.java
|
||||||
|
===================================================================
|
||||||
|
--- jitsi.orig/src/net/java/sip/communicator/impl/dns/DnsUtilActivator.java 2014-06-13 07:08:10.000000000 -0400
|
||||||
|
+++ jitsi/src/net/java/sip/communicator/impl/dns/DnsUtilActivator.java 2014-06-13 07:21:39.708148000 -0400
|
||||||
|
@@ -111,7 +111,7 @@
|
||||||
|
if(Logger.getLogger("org.xbill").isTraceEnabled())
|
||||||
|
Options.set("verbose", "1");
|
||||||
|
|
||||||
|
- Lookup.setCustomLogger(new DnsJavaLogger());
|
||||||
|
+ //Lookup.setCustomLogger(new DnsJavaLogger());
|
||||||
|
|
||||||
|
if(loadDNSProxyForward())
|
||||||
|
{
|
||||||
@ -1,292 +0,0 @@
|
|||||||
Index: jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c
|
|
||||||
===================================================================
|
|
||||||
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c 2013-11-11 06:03:23.817608000 -0500
|
|
||||||
+++ jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c 2013-11-11 06:06:14.037608000 -0500
|
|
||||||
@@ -454,14 +454,14 @@
|
|
||||||
DEFINE_AVCODECCONTEXT_I_PROPERTY_SETTER(trellis, trellis)
|
|
||||||
DEFINE_AVCODECCONTEXT_I_PROPERTY_SETTER(workaround_1bugs, workaround_bugs)
|
|
||||||
|
|
||||||
-JNIEXPORT jlong JNICALL
|
|
||||||
+/*JNIEXPORT jlong JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1alloc
|
|
||||||
(JNIEnv *env, jclass clazz)
|
|
||||||
{
|
|
||||||
return (jlong) (intptr_t) avfilter_graph_alloc();
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
-JNIEXPORT jint JNICALL
|
|
||||||
+/*JNIEXPORT jint JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1config
|
|
||||||
(JNIEnv *env, jclass clazz, jlong graph, jlong log_ctx)
|
|
||||||
{
|
|
||||||
@@ -470,18 +470,18 @@
|
|
||||||
avfilter_graph_config(
|
|
||||||
(AVFilterGraph *) (intptr_t) graph,
|
|
||||||
(AVClass *) (intptr_t) log_ctx);
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
-JNIEXPORT void JNICALL
|
|
||||||
+/*JNIEXPORT void JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1free
|
|
||||||
(JNIEnv *env, jclass clazz, jlong graph)
|
|
||||||
{
|
|
||||||
AVFilterGraph *graph_ = (AVFilterGraph *) (intptr_t) graph;
|
|
||||||
|
|
||||||
avfilter_graph_free(&graph_);
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
-JNIEXPORT jlong JNICALL
|
|
||||||
+/*JNIEXPORT jlong JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1get_1filter
|
|
||||||
(JNIEnv *env, jclass clazz, jlong graph, jstring name)
|
|
||||||
{
|
|
||||||
@@ -499,23 +499,23 @@
|
|
||||||
else
|
|
||||||
filter = NULL;
|
|
||||||
return (jlong) (intptr_t) filter;
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
-static int
|
|
||||||
+/*static int
|
|
||||||
ffsink_end_frame(AVFilterLink *link)
|
|
||||||
{
|
|
||||||
if (link->cur_buf)
|
|
||||||
link->dst->priv = avfilter_ref_buffer(link->cur_buf, ~0);
|
|
||||||
return 0;
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
-static int
|
|
||||||
+/*static int
|
|
||||||
ffsink_query_formats(AVFilterContext *ctx)
|
|
||||||
{
|
|
||||||
AVFilterContext *src = ctx;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
- /* Find buffer. */
|
|
||||||
+ / * Find buffer. * /
|
|
||||||
#ifdef _JITSI_LIBAV_
|
|
||||||
while (src && src->input_count && src->inputs)
|
|
||||||
#else
|
|
||||||
@@ -530,7 +530,7 @@
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* Make ffsink output in the format in which buffer inputs. */
|
|
||||||
+ / * Make ffsink output in the format in which buffer inputs. * /
|
|
||||||
if (src)
|
|
||||||
{
|
|
||||||
const int pix_fmts[] = { src->outputs[0]->in_formats->formats[0], -1 };
|
|
||||||
@@ -557,9 +557,9 @@
|
|
||||||
ffsink_uninit(AVFilterContext *ctx)
|
|
||||||
{
|
|
||||||
ctx->priv = NULL;
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
-JNIEXPORT jint JNICALL
|
|
||||||
+/*JNIEXPORT jint JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1parse
|
|
||||||
(JNIEnv *env, jclass clazz,
|
|
||||||
jlong graph, jstring filters, jlong inputs, jlong outputs, jlong log_ctx)
|
|
||||||
@@ -579,26 +579,26 @@
|
|
||||||
(AVFilterInOut **) (intptr_t) outputs,
|
|
||||||
(AVClass *) (intptr_t) log_ctx);
|
|
||||||
|
|
||||||
- /*
|
|
||||||
+ / *
|
|
||||||
* FIXME The implementation at the time of this writing presumes that
|
|
||||||
* the first filter is buffer, the last filter is nullsink meant to be
|
|
||||||
* ffsink and the ffsink is expected to output in the format in which
|
|
||||||
* the buffer inputs.
|
|
||||||
- */
|
|
||||||
+ * /
|
|
||||||
if (0 == ret)
|
|
||||||
{
|
|
||||||
- /* Turn nullsink into ffsink. */
|
|
||||||
+ / * Turn nullsink into ffsink. * /
|
|
||||||
unsigned filterCount = graph_->filter_count;
|
|
||||||
|
|
||||||
if (filterCount)
|
|
||||||
{
|
|
||||||
AVFilterContext *ffsink = graph_->filters[filterCount - 1];
|
|
||||||
|
|
||||||
- /*
|
|
||||||
+ / *
|
|
||||||
* Make sure query_format of ffsink outputs in the format in
|
|
||||||
* which buffer inputs. Otherwise, the output format may end up
|
|
||||||
* different on the C and Java sides.
|
|
||||||
- */
|
|
||||||
+ * /
|
|
||||||
ffsink->filter->uninit = ffsink_uninit;
|
|
||||||
ffsink->priv = NULL;
|
|
||||||
ffsink->filter->query_formats = ffsink_query_formats;
|
|
||||||
@@ -614,7 +614,7 @@
|
|
||||||
else
|
|
||||||
ret = AVERROR(ENOMEM);
|
|
||||||
return (jint) ret;
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
JNIEXPORT void JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1register_1all
|
|
||||||
@@ -623,12 +623,13 @@
|
|
||||||
avfilter_register_all();
|
|
||||||
}
|
|
||||||
|
|
||||||
-JNIEXPORT void JNICALL
|
|
||||||
+
|
|
||||||
+/*JNIEXPORT void JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1unref_1buffer
|
|
||||||
(JNIEnv *env, jclass clazz, jlong ref)
|
|
||||||
{
|
|
||||||
avfilter_unref_buffer((AVFilterBufferRef *) (intptr_t) ref);
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
JNIEXPORT jlong JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_avframe_1get_1pts
|
|
||||||
@@ -693,7 +694,7 @@
|
|
||||||
(int) width, (int) height);
|
|
||||||
}
|
|
||||||
|
|
||||||
-JNIEXPORT jlong JNICALL
|
|
||||||
+/*JNIEXPORT jlong JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_get_1filtered_1video_1frame
|
|
||||||
(JNIEnv *env, jclass clazz,
|
|
||||||
jlong input, jint width, jint height, jint pixFmt,
|
|
||||||
@@ -717,12 +718,12 @@
|
|
||||||
{
|
|
||||||
AVFrame *output_ = (AVFrame *) (intptr_t) output;
|
|
||||||
|
|
||||||
- /*
|
|
||||||
+ / *
|
|
||||||
* The data of cur_buf will be returned into output so it needs
|
|
||||||
* to exist at least while output needs it. So take ownership of
|
|
||||||
* cur_buf and the user of output will unref it when they are
|
|
||||||
* done with output.
|
|
||||||
- */
|
|
||||||
+ * /
|
|
||||||
ffsink_->priv = NULL;
|
|
||||||
|
|
||||||
memcpy(output_->data, ref->data, sizeof(output_->data));
|
|
||||||
@@ -736,7 +737,7 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return (jlong) (intptr_t) ref;
|
|
||||||
-}
|
|
||||||
+}*/
|
|
||||||
|
|
||||||
JNIEXPORT void JNICALL
|
|
||||||
Java_org_jitsi_impl_neomedia_codec_FFmpeg_memcpy___3IIIJ
|
|
||||||
Index: jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.h
|
|
||||||
===================================================================
|
|
||||||
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.h 2013-11-11 06:03:23.817608000 -0500
|
|
||||||
+++ jitsi-2.3.4901/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.h 2013-11-11 06:06:14.037608000 -0500
|
|
||||||
@@ -435,41 +435,41 @@
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avfilter_graph_alloc
|
|
||||||
* Signature: ()J
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT jlong JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1alloc
|
|
||||||
- (JNIEnv *, jclass);
|
|
||||||
+ (JNIEnv *, jclass); */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avfilter_graph_config
|
|
||||||
* Signature: (JJ)I
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1config
|
|
||||||
- (JNIEnv *, jclass, jlong, jlong);
|
|
||||||
+ (JNIEnv *, jclass, jlong, jlong); */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avfilter_graph_free
|
|
||||||
* Signature: (J)V
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT void JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1free
|
|
||||||
- (JNIEnv *, jclass, jlong);
|
|
||||||
+ (JNIEnv *, jclass, jlong); */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avfilter_graph_get_filter
|
|
||||||
* Signature: (JLjava/lang/String;)J
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT jlong JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1get_1filter
|
|
||||||
- (JNIEnv *, jclass, jlong, jstring);
|
|
||||||
+ (JNIEnv *, jclass, jlong, jstring); */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avfilter_graph_parse
|
|
||||||
* Signature: (JLjava/lang/String;JJJ)I
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1graph_1parse
|
|
||||||
- (JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong);
|
|
||||||
+ (JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong); */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
@@ -483,10 +483,10 @@
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avfilter_unref_buffer
|
|
||||||
* Signature: (J)V
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT void JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_avfilter_1unref_1buffer
|
|
||||||
(JNIEnv *, jclass, jlong);
|
|
||||||
-
|
|
||||||
+ */
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: avframe_get_pts
|
|
||||||
@@ -531,9 +531,9 @@
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
* Method: get_filtered_video_frame
|
|
||||||
* Signature: (JIIIJJJ)J
|
|
||||||
- */
|
|
||||||
+
|
|
||||||
JNIEXPORT jlong JNICALL Java_org_jitsi_impl_neomedia_codec_FFmpeg_get_1filtered_1video_1frame
|
|
||||||
- (JNIEnv *, jclass, jlong, jint, jint, jint, jlong, jlong, jlong);
|
|
||||||
+ (JNIEnv *, jclass, jlong, jint, jint, jint, jlong, jlong, jlong); */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Class: org_jitsi_impl_neomedia_codec_FFmpeg
|
|
||||||
Index: jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
|
|
||||||
===================================================================
|
|
||||||
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/org/jitsi/impl/neomedia/MediaServiceImpl.java 2013-11-11 06:03:23.825608000 -0500
|
|
||||||
+++ jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/MediaServiceImpl.java 2013-11-11 06:06:07.029608000 -0500
|
|
||||||
@@ -1123,7 +1123,7 @@
|
|
||||||
locator.getProtocol()))
|
|
||||||
codecs = new Codec[] { scaler };
|
|
||||||
else
|
|
||||||
- codecs = new Codec[] { new HFlip(), scaler };
|
|
||||||
+ codecs = new Codec[] { /*new HFlip(),*/ scaler };
|
|
||||||
|
|
||||||
trackControl.setCodecChain(codecs);
|
|
||||||
break;
|
|
||||||
Index: jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/device/VideoMediaDeviceSession.java
|
|
||||||
===================================================================
|
|
||||||
--- jitsi-2.3.4901.orig/lib/src/libjitsi/src/org/jitsi/impl/neomedia/device/VideoMediaDeviceSession.java 2013-11-11 06:03:23.861608000 -0500
|
|
||||||
+++ jitsi-2.3.4901/lib/src/libjitsi/src/org/jitsi/impl/neomedia/device/VideoMediaDeviceSession.java 2013-11-11 06:06:09.557608000 -0500
|
|
||||||
@@ -513,7 +513,7 @@
|
|
||||||
{
|
|
||||||
controllerUpdateForCreateLocalVisualComponent(
|
|
||||||
ev,
|
|
||||||
- hflip);
|
|
||||||
+ false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
localPlayer.configure();
|
|
||||||
@ -1,4 +1,3 @@
|
|||||||
bcprov-upgrade-1.48
|
bcprov-upgrade-1.48
|
||||||
remove-hflip
|
|
||||||
guava-update
|
guava-update
|
||||||
bcprov-backport-1.49
|
remove-dns-java-logger.patch
|
||||||
|
|||||||
Loading…
Reference in new issue