Skip to content

fix implicit conversation #13

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

Open
MaxBoych wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix implicit conversation #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
706070b
fix implicit conversion
May 5, 2024
fdc96fa
change module name
May 5, 2024
e45b15c
try to fix implicit conversion
May 5, 2024
4803360
fix implicit conversion v2
May 5, 2024
160596d
change go version
May 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/goheif.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
module github.com/adrium/goheif
module github.com/MaxBoych/goheif

go 1.21

require github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
5 changes: 2 additions & 3 deletions goheif.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ package goheif
import (
"bytes"
"fmt"
"github.com/MaxBoych/goheif/heif"
"github.com/MaxBoych/goheif/libde265"
"image"
"image/color"
"io"
"io/ioutil"

"github.com/adrium/goheif/heif"
"github.com/adrium/goheif/libde265"
)

// SafeEncoding uses more memory but seems to make
Expand Down
3 changes: 1 addition & 2 deletions heic2jpg/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ package main
import (
"flag"
"fmt"
"github.com/MaxBoych/goheif"
"image/jpeg"
"io"
"log"
"os"

"github.com/adrium/goheif"
)

// Skip Writer for exif writing
Expand Down
3 changes: 1 addition & 2 deletions heif/heif.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ package heif
import (
"errors"
"fmt"
"github.com/MaxBoych/goheif/heif/bmff"
"io"
"log"

"github.com/adrium/goheif/heif/bmff"
)

// File represents a HEIF file.
Expand Down
36 changes: 18 additions & 18 deletions libde265/libde265/x86/sse-motion.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3527,9 +3527,9 @@ void ff_hevc_put_hevc_qpel_h_1_v_1_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -3710,9 +3710,9 @@ void ff_hevc_put_hevc_qpel_h_1_v_2_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -3887,9 +3887,9 @@ void ff_hevc_put_hevc_qpel_h_1_v_3_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -4058,9 +4058,9 @@ void ff_hevc_put_hevc_qpel_h_2_v_1_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -4241,9 +4241,9 @@ void ff_hevc_put_hevc_qpel_h_2_v_2_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -4419,9 +4419,9 @@ void ff_hevc_put_hevc_qpel_h_2_v_3_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -4592,9 +4592,9 @@ void ff_hevc_put_hevc_qpel_h_3_v_1_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -4778,9 +4778,9 @@ void ff_hevc_put_hevc_qpel_h_3_v_2_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down Expand Up @@ -4958,9 +4958,9 @@ void ff_hevc_put_hevc_qpel_h_3_v_3_sse(int16_t *dst, ptrdiff_t dststride,
r0 = _mm_srli_epi32(r0, 6);

r1 = _mm_and_si128(r1,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_and_si128(r0,
_mm_set_epi16(0, 65535, 0, 65535, 0, 65535, 0, 65535));
_mm_set_epi16(0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF, 0, (unsigned short)0xFFFF));
r0 = _mm_hadd_epi16(r0, r1);
_mm_store_si128((__m128i *) &dst[x], r0);

Expand Down