Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support change of resolution during grabbing. Usecase: UDP streaming … #769

Merged
merged 12 commits into from
Sep 15, 2017
Merged

Support change of resolution during grabbing. Usecase: UDP streaming … #769

merged 12 commits into from
Sep 15, 2017

Commits on Aug 23, 2017

  1. Use locking callback from ffmpeg using a Java locking mechanism.

    Michael Fritscher committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    56f57c8 View commit details
    Browse the repository at this point in the history

  2. Support change of resolution during grabbing. Usecase: UDP streaming … 

    …with changing sources / qualities.

Test included.

Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    f6d69c2 View commit details
    Browse the repository at this point in the history

  3. Buildfix for Java 1.7 

    Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    418ac94 View commit details
    Browse the repository at this point in the history

  4. Build fixes for Java 1.7 

    Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Aug 23, 2017
    Configuration menu
    Copy the full SHA
    656d711 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2017

  1. Support change of resolution during grabbing. Usecase: UDP streaming … 

    …with changing sources / qualities.

Test included.

Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    a1ff527 View commit details
    Browse the repository at this point in the history

  2. Support change of resolution during grabbing. Usecase: UDP streaming … 

    …with changing sources / qualities.

Test included.

Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    1670eea View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dynamic_resolution' of https://github.com/mifritscher/j… 

    …avacv into dynamic_resolution

# Conflicts:
#	platform/src/test/java/org/bytedeco/javacv/FrameGrabberTestChangingResolution.java
    Michael Fritscher committed Aug 25, 2017
    Configuration menu
    Copy the full SHA
    1ee2601 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2017

  1. Merge branch 'master' of https://github.com/bytedeco/javacv 

    # Conflicts:
#	src/main/java/org/bytedeco/javacv/FFmpegFrameGrabber.java
#	src/main/java/org/bytedeco/javacv/FFmpegFrameRecorder.java
    Michael Fritscher committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    2f53408 View commit details
    Browse the repository at this point in the history

  2. Support change of resolution during grabbing. Usecase: UDP streaming … 

    …with changing sources / qualities.

Test included.

Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    f7099bb View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dynamic_resolution' of https://github.com/mifritscher/j… 

    …avacv into dynamic_resolution
    Michael Fritscher committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    6e113ba View commit details
    Browse the repository at this point in the history

  4. Renamed test for automatic testing 

    Signed-off-by: Michael Fritscher <michael.fritscher@telematik-zentrum.de>
    Michael Fritscher committed Sep 14, 2017
    Configuration menu
    Copy the full SHA
    63a3d2f View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2017

  1. Remove FFmpegFrameLock.java

    @saudet
    saudet committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    a17343d View commit details
    Browse the repository at this point in the history