"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Global.h" between
ssr-0.3.10.tar.gz and ssr-0.3.11.tar.gz

About: SimpleScreenRecorder is a screen (video-audio) recorder for Linux.

Global.h  (ssr-0.3.10):Global.h  (ssr-0.3.11)
skipping to change at line 99 skipping to change at line 99
// Replacement for Qt::WindowTransparentForInput. // Replacement for Qt::WindowTransparentForInput.
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#endif #endif
extern "C" { extern "C" {
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/avutil.h> #include <libavutil/avutil.h>
#include <libavutil/channel_layout.h>
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
#include <libavutil/pixfmt.h> #include <libavutil/pixfmt.h>
#include <libavutil/samplefmt.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
} }
// Whether x86/x64 specific instructions should be used. // Whether x86/x64 specific instructions should be used.
#ifndef SSR_USE_X86_ASM #ifndef SSR_USE_X86_ASM
#error SSR_USE_X86_ASM should be defined! #error SSR_USE_X86_ASM should be defined!
#endif #endif
// Whether ffmpeg or libav version numbers should be used for tests. The ffmpeg version number is usually slightly higher, // Whether ffmpeg or libav version numbers should be used for tests. The ffmpeg version number is usually slightly higher,
// so that's the default (deprecation warnings are better than compilation error s). // so that's the default (deprecation warnings are better than compilation error s).
skipping to change at line 172 skipping to change at line 174
// I recommend using the ffmpeg one: // I recommend using the ffmpeg one:
// http://git.videolan.org/?p=ffmpeg.git;a=blob;f=doc/APIchanges // http://git.videolan.org/?p=ffmpeg.git;a=blob;f=doc/APIchanges
// This one lists version numbers for both ffmpeg and libav whereas libav just i gnores ffmpeg. // This one lists version numbers for both ffmpeg and libav whereas libav just i gnores ffmpeg.
#if SSR_USE_FFMPEG_VERSIONS #if SSR_USE_FFMPEG_VERSIONS
#define TEST_AV_VERSION(prefix, ffmpeg_major, ffmpeg_minor, libav_major, libav_m inor) TEST_MAJOR_MINOR(prefix##_VERSION_MAJOR, prefix##_VERSION_MINOR, ffmpeg_ma jor, ffmpeg_minor) #define TEST_AV_VERSION(prefix, ffmpeg_major, ffmpeg_minor, libav_major, libav_m inor) TEST_MAJOR_MINOR(prefix##_VERSION_MAJOR, prefix##_VERSION_MINOR, ffmpeg_ma jor, ffmpeg_minor)
#else #else
#define TEST_AV_VERSION(prefix, ffmpeg_major, ffmpeg_minor, libav_major, libav_m inor) TEST_MAJOR_MINOR(prefix##_VERSION_MAJOR, prefix##_VERSION_MINOR, libav_maj or, libav_minor) #define TEST_AV_VERSION(prefix, ffmpeg_major, ffmpeg_minor, libav_major, libav_m inor) TEST_MAJOR_MINOR(prefix##_VERSION_MAJOR, prefix##_VERSION_MINOR, libav_maj or, libav_minor)
#endif #endif
// av_register_all deprecated: lavf 58.9.100 / ???
#define SSR_USE_AV_REGISTER_ALL_DEPRECATED TEST_AV_VERSION(LIBAVFORMAT,
58, 9, 999, 999)
// AVStream::codecpar: lavf 57.33.100 / 57.5.0 // AVStream::codecpar: lavf 57.33.100 / 57.5.0
#define SSR_USE_AVSTREAM_CODECPAR TEST_AV_VERSION(LIBAVFORMAT, 57, 33, 57, 5) #define SSR_USE_AVSTREAM_CODECPAR TEST_AV_VERSION(LIBAVFORMAT, 57, 33, 57, 5)
// AVStream::time_base as time base hint: lavf 55.44.100 / 55.20.0 // AVStream::time_base as time base hint: lavf 55.44.100 / 55.20.0
#define SSR_USE_AVSTREAM_TIME_BASE TEST_AV_VERSION(LIBAVFORMAT, 55, 44, 55, 20) #define SSR_USE_AVSTREAM_TIME_BASE TEST_AV_VERSION(LIBAVFORMAT, 55, 44, 55, 20)
// avformat_network_init: lavf 53.19.0 / 53.13.0 // avformat_network_init: lavf 53.19.0 / 53.13.0
#define SSR_USE_AVFORMAT_NETWORK_INIT TEST_AV_VERSION(LIBAVFORMAT, 53, 19, 53, 13) #define SSR_USE_AVFORMAT_NETWORK_INIT TEST_AV_VERSION(LIBAVFORMAT, 53, 19, 53, 13)
// avformat_new_stream: lavf 53.17.0 / 53.10.0 // avformat_new_stream: lavf 53.17.0 / 53.10.0
#define SSR_USE_AVFORMAT_NEW_STREAM TEST_AV_VERSION(LIBAVFORMAT, 53, 17, 53, 10) #define SSR_USE_AVFORMAT_NEW_STREAM TEST_AV_VERSION(LIBAVFORMAT, 53, 17, 53, 10)
// avformat_query_codec: lavf 53.11.0 / 53.8.0 // avformat_query_codec: lavf 53.11.0 / 53.8.0
#define SSR_USE_AVFORMAT_QUERY_CODEC TEST_AV_VERSION(LIBAVFORMAT, 53, 11, 53, 8) #define SSR_USE_AVFORMAT_QUERY_CODEC TEST_AV_VERSION(LIBAVFORMAT, 53, 11, 53, 8)
// avformat_free_context: lavf 52.96.0 / 52.96.0 // avformat_free_context: lavf 52.96.0 / 52.96.0
#define SSR_USE_AVFORMAT_FREE_CONTEXT TEST_AV_VERSION(LIBAVFORMAT, 52, 96, 52, 96) #define SSR_USE_AVFORMAT_FREE_CONTEXT TEST_AV_VERSION(LIBAVFORMAT, 52, 96, 52, 96)
// av_lockmgr_register deprecated: lavc 58.9.100 / ???
#define SSR_USE_AV_LOCKMGR_REGISTER_DEPRECATED TEST_AV_VERSION(LIBAVCODEC, 5
8, 9, 999, 999)
// avcodec_send_packet, avcodec_receive_frame, avcodec_send_frame, avcodec_recei ve_packet: lavc 57.37.100 / ??? // avcodec_send_packet, avcodec_receive_frame, avcodec_send_frame, avcodec_recei ve_packet: lavc 57.37.100 / ???
#define SSR_USE_AVCODEC_SEND_RECEIVE TEST_AV_VERSION(LIBAVCODEC, 5 7, 37, 999, 999) #define SSR_USE_AVCODEC_SEND_RECEIVE TEST_AV_VERSION(LIBAVCODEC, 5 7, 37, 999, 999)
// av_packet_alloc: lavc 57.12.100 / 57.8.0 // av_packet_alloc: lavc 57.12.100 / 57.8.0
#define SSR_USE_AV_PACKET_ALLOC TEST_AV_VERSION(LIBAVCODEC, 5 7, 12, 57, 8) #define SSR_USE_AV_PACKET_ALLOC TEST_AV_VERSION(LIBAVCODEC, 5 7, 12, 57, 8)
// AV_CODEC_CAP_*, AV_CODEC_FLAG_*: lavc 56.56.100 / 56.35.0
#define SSR_USE_AV_CODEC_CAP TEST_AV_VERSION(LIBAVCODEC, 5
6, 56, 56, 35)
#define SSR_USE_AV_CODEC_FLAG TEST_AV_VERSION(LIBAVCODEC, 5
6, 56, 56, 35)
// av_packet_rescale_ts: lavc 55.68.100 / 55.55.0 // av_packet_rescale_ts: lavc 55.68.100 / 55.55.0
#define SSR_USE_AV_PACKET_RESCALE_TS TEST_AV_VERSION(LIBAVCODEC, 5 5, 68, 55, 55) #define SSR_USE_AV_PACKET_RESCALE_TS TEST_AV_VERSION(LIBAVCODEC, 5 5, 68, 55, 55)
// AVCodecContext::side_data_only_packets added: lavc 55.66.100 / 55.54.0 // AVCodecContext::side_data_only_packets added: lavc 55.66.100 / 55.54.0
#define SSR_USE_SIDE_DATA_ONLY_PACKETS TEST_AV_VERSION(LIBAVCODEC, 5 5, 66, 55, 54) #define SSR_USE_SIDE_DATA_ONLY_PACKETS TEST_AV_VERSION(LIBAVCODEC, 5 5, 66, 55, 54)
// AVCodecContext::side_data_only_packets deprecated: lavc 57.2 / 57.2 // AVCodecContext::side_data_only_packets deprecated: lavc 57.2 / 57.2
// - ffmpeg: missing, commit: https://git.videolan.org/?p=ffmpeg.git;a=commit;h= 6064f697a321174232a3fad351afb21150c3e9e5 // - ffmpeg: missing, commit: https://git.videolan.org/?p=ffmpeg.git;a=commit;h= 6064f697a321174232a3fad351afb21150c3e9e5
// - libav: missing, commit: https://git.libav.org/?p=libav.git;a=commit;h=6064f 697a321174232a3fad351afb21150c3e9e5 // - libav: missing, commit: https://git.libav.org/?p=libav.git;a=commit;h=6064f 697a321174232a3fad351afb21150c3e9e5
#define SSR_USE_SIDE_DATA_ONLY_PACKETS_DEPRECATED TEST_AV_VERSION(LIBAVCODEC, 5 7, 2, 57, 2) #define SSR_USE_SIDE_DATA_ONLY_PACKETS_DEPRECATED TEST_AV_VERSION(LIBAVCODEC, 5 7, 2, 57, 2)
// av_frame_alloc, av_frame_free: lavc 55.45.101 / 55.28.1 // av_frame_alloc, av_frame_free: lavc 55.45.101 / 55.28.1
#define SSR_USE_AV_FRAME_ALLOC TEST_AV_VERSION(LIBAVCODEC, 5 5, 45, 55, 28) #define SSR_USE_AV_FRAME_ALLOC TEST_AV_VERSION(LIBAVCODEC, 5 5, 45, 55, 28)
skipping to change at line 269 skipping to change at line 278
inline virtual const char* what() const throw() override { inline virtual const char* what() const throw() override {
return "GLInjectException"; return "GLInjectException";
} }
}; };
class SSRStreamException : public std::exception { class SSRStreamException : public std::exception {
public: public:
inline virtual const char* what() const throw() override { inline virtual const char* what() const throw() override {
return "SSRStreamException"; return "SSRStreamException";
} }
}; };
#if SSR_USE_ALSA
class ALSAException : public std::exception { class ALSAException : public std::exception {
public: public:
inline virtual const char* what() const throw() override { inline virtual const char* what() const throw() override {
return "ALSAException"; return "ALSAException";
} }
}; };
#endif
#if SSR_USE_PULSEAUDIO #if SSR_USE_PULSEAUDIO
class PulseAudioException : public std::exception { class PulseAudioException : public std::exception {
public: public:
inline virtual const char* what() const throw() override { inline virtual const char* what() const throw() override {
return "PulseAudioException"; return "PulseAudioException";
} }
}; };
#endif #endif
#if SSR_USE_JACK
class JACKException : public std::exception { class JACKException : public std::exception {
public: public:
inline virtual const char* what() const throw() override { inline virtual const char* what() const throw() override {
return "JACKException"; return "JACKException";
} }
}; };
#endif
// simple function to do 16-byte alignment // simple function to do 16-byte alignment
inline size_t grow_align16(size_t size) { inline size_t grow_align16(size_t size) {
return (size_t) (size + 15) & ~((size_t) 15); return (size_t) (size + 15) & ~((size_t) 15);
} }
// high resolution timer // high resolution timer
inline int64_t hrt_time_micro() { inline int64_t hrt_time_micro() {
timespec ts; timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts); clock_gettime(CLOCK_MONOTONIC, &ts);
 End of changes. 9 change blocks. 
0 lines changed or deleted 17 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)