Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
View
5 jni/ffmpeg-jni.c
@@ -85,6 +85,9 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
/* Register all formats. */
av_register_all();
+ /* No-op on Linux I think, but ffmpeg bitches if I don't call this. */
+ avformat_network_init();
+
/* Capture ffmpeg logging. */
av_log_set_callback(dalvik_log_callback);
@@ -179,7 +182,7 @@ jint Java_org_devtcg_rojocam_ffmpeg_FFStreamConfig_nativeCreate(JNIEnv *env,
* I'd rather stick to the simpler, less variable approach. */
videoEnc->time_base.num = 1;
videoEnc->time_base.den = 24;
- videoEnc->bit_rate = 400000;
+ videoEnc->bit_rate = 180000;
videoEnc->width = 480;
videoEnc->height = 320;
videoEnc->pix_fmt = PIX_FMT_YUV420P;
View
18 src/org/devtcg/rojocam/CamcorderMediaHandler.java
@@ -27,23 +27,9 @@ public CamcorderMediaHandler(ReferenceCounter<StreamingHeadlessCamcorder> camcor
public String onDescribe(String feedUri) {
String desc = mStreamConfig.getSDPDescription();
- Log.d(TAG, "desc=" + desc);
+ Log.d(TAG, "SDP:");
+ Log.d(TAG, desc);
return desc;
-// /*
-// * XXX: I haven't bothered to understand this format well enough to
-// * create a proper builder class.
-// */
-// StringBuilder b = new StringBuilder();
-// b.append("o=- 0 0 IN IP4 127.0.0.1\n");
-// b.append("t=0 0\n");
-// b.append("s=No Title\n");
-// b.append("m=video 0 RTP/AVP 96\n");
-// b.append("a=rtpmap:96 H263-1998/90000\n");
-// b.append("a=control:streamid=0\n");
-// b.append("a=fmtp:96 profile=0; level=40\n");
-// b.append("a=cliprect:0,0,144,176\n");
-// b.append("a=framesize:96 176-144\n");
-// return b.toString();
}
public MediaSession createSession(InetAddress client, RtpTransport transport) {

No commit comments for this range

Something went wrong with that request. Please try again.